diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2013-08-01 02:39:17 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2013-08-01 02:39:17 +0400 |
commit | ac8e379a87b78ed96cc9dac5fe5b88e5bd4979f7 (patch) | |
tree | de5921e56056704e1ad62647debd493c4dbebbbf | |
parent | e48acb7decf9032c51208d7e55dd81279a3914dc (diff) |
Fix linking issue, we use bundled static glew so we should define static glew in ghost as well.
-rw-r--r-- | intern/ghost/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/ghost/SConscript | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 12dd4c0d3eb..2538f0612db 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -315,5 +315,7 @@ elseif(WIN32) endif() +add_definitions(-DGLEW_STATIC) + blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 0d7df2847e0..e48e4ee6b96 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -38,7 +38,7 @@ if window_system == 'darwin': pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager'] -defs=['_USE_MATH_DEFINES'] +defs=['_USE_MATH_DEFINES', 'GLEW_STATIC'] incs = [ '.', @@ -142,7 +142,6 @@ else: except ValueError: pass - if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc', 'win64-mingw'): incs = env['BF_WINTAB_INC'] + ' ' + incs incs += ' ../utfconv' |