Browse Source

compile on recent ubuntu

Thomas Buck 1 month ago
parent
commit
b8fd64ded3
2 changed files with 4 additions and 3 deletions
  1. 1
    0
      src/CMakeLists.txt
  2. 3
    3
      src/main.cpp

+ 1
- 0
src/CMakeLists.txt View File

14
 # Add glbinding Library
14
 # Add glbinding Library
15
 find_package (glbinding REQUIRED)
15
 find_package (glbinding REQUIRED)
16
 include_directories (SYSTEM ${GLBINDING_INCLUDES})
16
 include_directories (SYSTEM ${GLBINDING_INCLUDES})
17
+set (GLBINDING_LIBRARIES "glbinding::glbinding")
17
 set (LIBS ${LIBS} ${GLBINDING_LIBRARIES})
18
 set (LIBS ${LIBS} ${GLBINDING_LIBRARIES})
18
 
19
 
19
 # Add SDL2 Library
20
 # Add SDL2 Library

+ 3
- 3
src/main.cpp View File

27
 #include <glbinding/Binding.h>
27
 #include <glbinding/Binding.h>
28
 #include <ezoptionparser/ezOptionParser.hpp>
28
 #include <ezoptionparser/ezOptionParser.hpp>
29
 
29
 
30
-#ifdef DEBUG
30
+#ifdef DEBUG_GLBINDINGS
31
 #include <glbinding/callbacks.h>
31
 #include <glbinding/callbacks.h>
32
 #include <glbinding/Meta.h>
32
 #include <glbinding/Meta.h>
33
 #endif
33
 #endif
34
 
34
 
35
 static std::string configFileToUse;
35
 static std::string configFileToUse;
36
 
36
 
37
-#ifdef DEBUG
37
+#ifdef DEBUG_GLBINDINGS
38
 static void glErrorCallback(const glbinding::FunctionCall& call) {
38
 static void glErrorCallback(const glbinding::FunctionCall& call) {
39
     RunTime::incrementCallCount();
39
     RunTime::incrementCallCount();
40
 
40
 
126
     RunTime::initialize(); // RunTime is required by other constructors
126
     RunTime::initialize(); // RunTime is required by other constructors
127
     Command::fillCommandList();
127
     Command::fillCommandList();
128
 
128
 
129
-#ifdef DEBUG
129
+#ifdef DEBUG_GLBINDINGS
130
     // Register global OpenGL after-callback for all GL functions except glGetError
130
     // Register global OpenGL after-callback for all GL functions except glGetError
131
     glbinding::setCallbackMaskExcept(glbinding::CallbackMask::After
131
     glbinding::setCallbackMaskExcept(glbinding::CallbackMask::After
132
                                      | glbinding::CallbackMask::ParametersAndReturnValue,
132
                                      | glbinding::CallbackMask::ParametersAndReturnValue,

Loading…
Cancel
Save