diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:17:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:22:54 +0400 |
| commit | 54ee22130ca0ce59500c6eddb562b78eb4526bcd (patch) | |
| tree | ba21cdaa35656c590059c864e028e24b6e234082 /source/blender/windowmanager/CMakeLists.txt | |
| parent | b09f7dcaa7b487ada53c8dbaa811deaa1201d163 (diff) | |
| parent | 04814476c08e9350c424619cd99ccb1149d65365 (diff) | |
Merge branch 'master' into dyntopo_holesdyntopo_holes
Conflicts:
source/blender/blenkernel/intern/pbvh_bmesh.c
Diffstat (limited to 'source/blender/windowmanager/CMakeLists.txt')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 5f993297840..088bddc8a76 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -40,12 +40,12 @@ set(INC ../../gameengine/BlenderRoutines ../../../intern/ghost ../../../intern/guardedalloc + ../../../intern/glew-mx ../../../intern/memutil ) set(INC_SYS ${ZLIB_INCLUDE_DIRS} - ${OPENGL_INCLUDE_DIR} ${GLEW_INCLUDE_PATH} ) @@ -78,7 +78,7 @@ set(SRC wm_window.h ) -add_definitions(-DGLEW_STATIC) +add_definitions(${GL_DEFINITIONS}) if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) @@ -107,6 +107,8 @@ endif() if(WITH_HEADLESS) add_definitions(-DWITH_HEADLESS) +elseif(WITH_X11) + add_definitions(-DWITH_X11) endif() if(WITH_PYTHON) |