diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-02-04 14:02:59 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-02-04 14:02:59 +0400 |
| commit | d84573386e5ee0c63d8f4bebb3984fc6385bcb90 (patch) | |
| tree | 501736d39823b7ea9d929f4f059e9e325f6bd48a /source/blender/blenfont | |
| parent | deec4ce0bc77519f68392bc5b29ef211a31f1588 (diff) | |
Fix MinGW compilation due to recent font rendering changes.
GLEW_STATIC needs to be defined for static linking of GLEW or the dynamic entry points are looked up during linking
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/blenfont/SConscript | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index d9282978562..ebf9ff4db39 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -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}") diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index 1a86d0ad671..c46960d2311 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -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') |