widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

SirVer has proposed merging lp:~widelands-dev/widelands/ppa_glbinding into lp:widelands.

Commit message:
Change the PPA to build against the glbinding PPA so that we can get debug traces from OpenGL.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ppa_glbinding/+merge/285302
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ppa_glbinding into lp:widelands.

=== modified file 'cmake/WlFunctions.cmake'
--- cmake/WlFunctions.cmake	2016-01-25 20:17:03 +0000
+++ cmake/WlFunctions.cmake	2016-02-08 06:26:14 +0000
@@ -95,8 +95,15 @@
   endif()
   if(ARG_USES_OPENGL)
     if(OPTION_USE_GLBINDING)
-      wl_include_system_directories(${NAME} ${GLBINDING_INCLUDES})
-      target_link_libraries(${NAME} ${GLBINDING_LIBRARIES})
+      # Early versions of glbinding defined GLBINDING_INCLUDES, newer use
+      # cmake's module system.
+      if(DEFINED GLBINDING_INCLUDES)
+        wl_include_system_directories(${NAME} ${GLBINDING_INCLUDES})
+        target_link_libraries(${NAME} ${GLBINDING_LIBRARIES})
+      else()
+        target_link_libraries(${NAME} glbinding::glbinding)
+      endif()
+
       target_link_libraries(${NAME} ${OPENGL_gl_LIBRARY})
     else()
       wl_include_system_directories(${NAME} ${GLEW_INCLUDE_DIR})

=== modified file 'debian/control'
--- debian/control	2016-01-26 19:49:01 +0000
+++ debian/control	2016-02-08 06:26:14 +0000
@@ -19,7 +19,8 @@
   doxygen, 
   cmake, 
   imagemagick,
-  libglew1.6-dev | libglew-dev,
+  libglbinding,
+  libglbinding-dev,
   libpng-dev, 
   zlib1g-dev
 Vcs-Git: git://git.debian.org/git/pkg-games/widelands.git

=== modified file 'debian/rules'
--- debian/rules	2016-02-04 07:39:37 +0000
+++ debian/rules	2016-02-08 06:26:14 +0000
@@ -15,6 +15,7 @@
 	  dh_auto_configure -Scmake -- \
 		-DWL_INSTALL_BASEDIR=/usr/share/games/widelands \
 		-DWL_INSTALL_DATADIR=/usr/share/games/widelands/data \
+		-DOPTION_USE_GLBINDING:BOOL=ON \
 		-DCMAKE_BUILD_TYPE=Release
 
 override_dh_strip: