FIX: ArchLinux compile

K-3D · Apr 7, 2013 · d4c8e38 · d4c8e38
1 parent eac49f4
commit d4c8e38
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 .kdev4
 *.kdev4
+*.pyc
+share/k3d/guide/content/._pipeline.txt
diff --git a/k3dsdk/python/CMakeLists.txt b/k3dsdk/python/CMakeLists.txt
@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${k3dsdk_BINARY_DIR})
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${K3D_GLIBMM_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${K3D_SIGC_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${K3D_PYTHON_INCLUDE_PATH})
+INCLUDE_DIRECTORIES(${K3D_PYTHON_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(${K3D_SIGC_LIB_DIRS})
 

diff --git a/modules/osmesa/context_factory.cpp b/modules/osmesa/context_factory.cpp
@@ -38,6 +38,10 @@
 #define GLAPIENTRY
 #endif
 
+#ifndef GLAPI
+#define GLAPI
+#endif
+
 #include <GL/osmesa.h>
 
 #include <dlfcn.h>