Преглед на файлове

compile on recent ubuntu

Thomas Buck преди 7 месеца
родител
ревизия
b8fd64ded3
променени са 2 файла, в които са добавени 4 реда и са изтрити 3 реда
  1. 1
    0
      src/CMakeLists.txt
  2. 3
    3
      src/main.cpp

+ 1
- 0
src/CMakeLists.txt Целия файл

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

+ 3
- 3
src/main.cpp Целия файл

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

Loading…
Отказ
Запис