Fix MinGW compilation due to recent font rendering changes.
authorAntony Riakiotakis <kalast@gmail.com>
Sat, 4 Feb 2012 10:02:59 +0000 (10:02 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Sat, 4 Feb 2012 10:02:59 +0000 (10:02 +0000)
GLEW_STATIC needs to be defined for static linking of GLEW or the dynamic entry points are looked up during linking

source/blender/blenfont/CMakeLists.txt
source/blender/blenfont/SConscript

index d92829785620aa615ed90e321d33075ba717a2d7..ebf9ff4db39b831f4157c915aef1b9d475bab658 100644 (file)
@@ -57,5 +57,7 @@ if(WITH_INTERNATIONAL)
        add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
+add_definitions(-DGLEW_STATIC)
+
 blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")
 
index 1a86d0ad671fc70dc5f234dfdbdbf9b1823354e9..c46960d2311c5ca83fcf8a01427fb2f8ccc647c7 100644 (file)
@@ -9,7 +9,7 @@ incs += ' #/extern/glew/include'
 incs += ' ' + env['BF_FREETYPE_INC']
 incs += ' ' + env['BF_GETTEXT_INC']
 
-defs = []
+defs = ['GLEW_STATIC']
 
 if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross':
     defs.append('_WIN32')