1. yotis
  2. glxx

Commits

yotis  committed 54abfa5

Fixed linux compilation

  • Participants
  • Parent commits c467745
  • Branches default

Comments (0)

Files changed (3)

File .hgignore

View file
 glob:generator/unprocessed_*.spec.txt
 glob:*.pyc
+glob:Makefile
 glob:*.lib
-glob:*.a
+glob:lib*.so*
 glob:*.pkl
 glob:*~
 glob:*.pro.user*

File generator/glXxx.py

View file
 
 #ifdef __linux__
 
+#include <glXxx/private/glXxx.h>
+#undef GLXX_NAMESPACE_INJECTION
+#include <glXxx/glXxx_all.h>
+#include <GL/glx.h>
 #include <cassert>
 #include <string>
 #include <cstring>
 #include <memory>
 #include <tr1/memory>
 
-#include <glXxx/private/glXxx.h>
-#include <glXxx/glXxx_all.h>
-#include <GL/glx.h>
-
 GLXContext glXxxGetCurrentCtx()
 {
     return glXGetCurrentContext();

File src/glXxx.cpp

View file
 
 #ifdef __linux__
 
+#include <glXxx/private/glXxx.h>
+#undef GLXX_NAMESPACE_INJECTION
+#include <glXxx/glXxx_all.h>
+#include <GL/glx.h>
 #include <cassert>
 #include <string>
 #include <cstring>
 #include <memory>
 #include <tr1/memory>
 
-#include <glXxx/private/glXxx.h>
-#include <glXxx/glXxx_all.h>
-#include <GL/glx.h>
-
 GLXContext glXxxGetCurrentCtx()
 {
     return glXGetCurrentContext();