widelands

Merge lp:~widelands-dev/widelands/bug_1836107_lGL into lp:widelands

  1. bug_1836107_lGL
  2. Merge into trunk
Proposed by kaputtnik
Status: Merged
Merged at revision: 9165
Proposed branch: lp:~widelands-dev/widelands/bug_1836107_lGL
Merge into: lp:widelands
Diff against target: 34 lines (+3/-3)
2 files modified
CMakeLists.txt (+1/-1)
utils/win32/innosetup/Widelands.iss (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug_1836107_lGL
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+370334@code.launchpad.net

Commit message

Link GL libraries insted of setting flags.
Fixes appveyor failures due to missing lbpdcurses.dll

Description of the change

See https://bugs.launchpad.net/widelands/+bug/1836107

One should may apply a better commit message ;)

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5272. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/560611605.
Appveyor build 5048. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1836107_lGL-5048.

Revision history for this message
kaputtnik (franku) wrote :

r9166 according to https://www.widelands.org/forum/post/29015/

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5274. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/561026259.
Appveyor build 5050. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1836107_lGL-5050.

Revision history for this message
kaputtnik (franku) wrote :

Looks good now.

Thanks to Dirk Stöcker for the fix.

I don't think this needs a code review:

@bunnybot merge

Revision history for this message
GunChleoc (gunchleoc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2019-06-15 09:13:13 +0000
+++ CMakeLists.txt 2019-07-19 13:17:10 +0000
@@ -182,7 +182,7 @@
182182
183# This is set to avoid linker errors when using GLVND-libs on Linux183# This is set to avoid linker errors when using GLVND-libs on Linux
184if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")184if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
185 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL")185 link_libraries("GL")
186 add_compile_definitions(WL_USE_GLVND)186 add_compile_definitions(WL_USE_GLVND)
187 message(STATUS "Adding linker flags for GLVND.")187 message(STATUS "Adding linker flags for GLVND.")
188endif()188endif()
189189
=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss 2019-06-01 20:53:24 +0000
+++ utils/win32/innosetup/Widelands.iss 2019-07-19 13:17:10 +0000
@@ -103,7 +103,7 @@
103Source: {#BuildFolder}\data\ai\*; DestDir: {app}\data\ai\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"103Source: {#BuildFolder}\data\ai\*; DestDir: {app}\data\ai\; Flags: recursesubdirs ignoreversion; Tasks: ; Languages: ; Attribs: hidden; Components: "Widelands"
104Source: {#DLLFolder}\libopusfile-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"104Source: {#DLLFolder}\libopusfile-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
105Source: {#DLLFolder}\libopus-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"105Source: {#DLLFolder}\libopus-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
106Source: {#DLLFolder}\libpdcurses.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"106Source: {#DLLFolder}\libtermcap-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
107Source: {#DLLFolder}\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"107Source: {#DLLFolder}\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
108Source: {#DLLFolder}\libreadline8.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"108Source: {#DLLFolder}\libreadline8.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
109Source: {#DLLFolder}\libicuuc64.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"109Source: {#DLLFolder}\libicuuc64.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
@@ -113,7 +113,7 @@
113Source: {#DLLFolder}\libgcc_s_seh-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"113Source: {#DLLFolder}\libgcc_s_seh-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
114#else114#else
115Source: {#DLLFolder}\libgcc_s_dw2-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"115Source: {#DLLFolder}\libgcc_s_dw2-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
116#endif116#endif
117Source: {#DLLFolder}\glew32.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"117Source: {#DLLFolder}\glew32.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
118Source: {#DLLFolder}\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"118Source: {#DLLFolder}\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
119Source: {#DLLFolder}\libharfbuzz-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"119Source: {#DLLFolder}\libharfbuzz-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"

Subscribers

People subscribed via source and target branches

to status/vote changes: