hessenfarmer has proposed merging lp:~widelands-dev/widelands/appveyor_opengl into lp:widelands.
Commit message: Stick to glew for the moment being as glbinding is causing a lot of problem recently Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/appveyor_opengl/+merge/368039 using glew for x64 builds as well now to get appveyor running again. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor_opengl into lp:widelands.
=== modified file 'appveyor.yml' --- appveyor.yml 2019-04-25 15:49:31 +0000 +++ appveyor.yml 2019-05-29 08:16:43 +0000 @@ -21,8 +21,8 @@ - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\"" - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\"" # Installed required libs - - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image\"" - - cmd: "IF \"%PLATFORM%\" == \"x86\" (bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-glew\") ELSE (bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-glbinding\")" + - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glew\"" + #- cmd: "IF \"%PLATFORM%\" == \"x86\" (bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-glew\") ELSE (bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-glbinding\")" # CMake can't find Boost 1.70 yet, so we have to downgrade # - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.69.0-2-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-%MINGWSUFFIX%-boost-1.69.0-2-any.pkg.tar.xz\"" @@ -39,7 +39,7 @@ - cmd: md build - cmd: cd build - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE - - cmd: "IF \"%PLATFORM%\" == \"x86\" (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%) ELSE (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%)" + - cmd: "IF \"%PLATFORM%\" == \"x86\" (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%) ELSE (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%)" - cmd: "cmake --build ." on_success: - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe === modified file 'utils/win32/innosetup/Widelands.iss' --- utils/win32/innosetup/Widelands.iss 2019-04-23 07:47:25 +0000 +++ utils/win32/innosetup/Widelands.iss 2019-05-29 08:16:43 +0000 @@ -111,11 +111,12 @@ Source: {#DLLFolder}\libfreetype-6.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands" #if GetEnv("PLATFORM") == "x64" Source: {#DLLFolder}\libgcc_s_seh-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands" -Source: {#DLLFolder}\libglbinding.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands" +;Source: {#DLLFolder}\libglbinding.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands" #else Source: {#DLLFolder}\libgcc_s_dw2-1.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands" +;Source: {#DLLFolder}\glew32.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands" +#endif Source: {#DLLFolder}\glew32.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands" -#endif Source: {#DLLFolder}\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands" Source: {#DLLFolder}\libharfbuzz-0.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands" Source: {#DLLFolder}\libicudt64.dll; DestDir: {app}; Flags: ignoreversion; Components: "Widelands"
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
