widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1789835 in widelands: "Appveyor glbinding incompatible with WL code"
  https://bugs.launchpad.net/widelands/+bug/1789835

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade/+merge/354171

Same as https://code.launchpad.net/~widelands-dev/widelands/appveyor_glbinding but with Boost downgrade too
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor_glbinding_with_boost_downgrade into lp:widelands.

=== modified file 'appveyor.yml'
--- appveyor.yml	2018-07-23 16:16:32 +0000
+++ appveyor.yml	2018-09-03 07:34:44 +0000
@@ -20,6 +20,8 @@
   - cmd: "bash --login -c \"pacman -Su --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 mingw-w64-%MINGWSUFFIX%-glbinding\""
+  # Downgrade Boost, because CMake can't find the new version yet
+  - cmd: "bash --login -c \"pacman --noconfirm -U http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.66.0-2-any.pkg.tar.xz\"";
 
 shallow_clone: true
 

=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc	2018-08-28 07:53:33 +0000
+++ src/graphic/gl/initialize.cc	2018-09-03 07:34:44 +0000
@@ -48,7 +48,10 @@
 	SDL_GL_MakeCurrent(sdl_window, gl_context);
 
 #ifdef USE_GLBINDING
-	glbinding::Binding::initialize();
+	// Documentation:
+	// https://github.com/cginternals/glbinding
+	// https://glbinding.org/
+	glbinding::Binding::initialize(glbinding::getCurrentContext());
 
 	// The undocumented command line argument --debug_gl_trace will set
 	// Trace::kYes. This will log every OpenGL call that is made, together with