Page MenuHome

Fix some compilation issues
ActivePublic

Authored by Antonis Ryakiotakis (psy-fi) on Jul 20 2014, 7:28 PM.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3bbcde..63e770a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -632,11 +632,11 @@ if(WITH_X11)
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
- list(APPEND PLATFORM_LINKLIBS "${X11_X11_LIB}")
+ list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB})
if(WITH_X11_XINPUT)
if(X11_Xinput_LIB)
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
+ list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
else()
set(WITH_X11_XINPUT OFF)
endif()
@@ -647,7 +647,7 @@ if(WITH_X11)
FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH})
mark_as_advanced(X11_Xxf86vmode_LIB)
if(X11_Xxf86vmode_LIB)
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xxf86vmode_LIB}")
+ list(APPEND PLATFORM_LINKLIBS ${X11_Xxf86vmode_LIB})
else()
set(WITH_X11_XF86VMODE OFF)
endif()
diff --git a/intern/ghost/intern/GHOST_Context.cpp b/intern/ghost/intern/GHOST_Context.cpp
index 40eb0ac..13a4c5f 100644
--- a/intern/ghost/intern/GHOST_Context.cpp
+++ b/intern/ghost/intern/GHOST_Context.cpp
@@ -52,7 +52,7 @@ const char* get_glew_error_message_string(GLenum error)
case GLEW_ERROR_GLX_VERSION_11_ONLY:
return "GLX 1.2 or later is required.";
-#if WITH_GLEW_ES
+#ifdef WITH_GLEW_ES
case GLEW_ERROR_NOT_GLES_VERSION:
return "OpenGL ES is required.";
@@ -88,7 +88,7 @@ const char* get_glew_error_enum_string(GLenum error)
case GLEW_ERROR_GLX_VERSION_11_ONLY:
return "GLEW_ERROR_GLX_VERSION_11_ONLY";
-#if WITH_GLEW_ES
+#ifdef WITH_GLEW_ES
case GLEW_ERROR_NOT_GLES_VERSION:
return "GLEW_ERROR_NOT_GLES_VERSION";
diff --git a/intern/ghost/intern/GHOST_ContextGLX.cpp b/intern/ghost/intern/GHOST_ContextGLX.cpp
index fe087ed..c8d10e3 100644
--- a/intern/ghost/intern/GHOST_ContextGLX.cpp
+++ b/intern/ghost/intern/GHOST_ContextGLX.cpp
@@ -31,6 +31,7 @@
*/
#include "GHOST_ContextGLX.h"
+#include "GHOST_SystemX11.h"
#include <vector>

Event Timeline

Antonis Ryakiotakis (psy-fi) changed the title of this paste from untitled to Fix some compilation issues.
Antonis Ryakiotakis (psy-fi) updated the paste's language from autodetect to autodetect.