[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58797] trunk/blender/intern/ghost: Fix linking issue, we use bundled static glew so we should define static glew in ghost as well .
Antony Riakiotakis
kalast at gmail.com
Thu Aug 1 00:39:17 CEST 2013
Revision: 58797
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58797
Author: psy-fi
Date: 2013-07-31 22:39:17 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Fix linking issue, we use bundled static glew so we should define static glew in ghost as well.
Modified Paths:
--------------
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/intern/ghost/SConscript
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2013-07-31 22:37:54 UTC (rev 58796)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2013-07-31 22:39:17 UTC (rev 58797)
@@ -315,5 +315,7 @@
endif()
+add_definitions(-DGLEW_STATIC)
+
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript 2013-07-31 22:37:54 UTC (rev 58796)
+++ trunk/blender/intern/ghost/SConscript 2013-07-31 22:39:17 UTC (rev 58797)
@@ -38,7 +38,7 @@
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 @@
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'
More information about the Bf-blender-cvs
mailing list