From d84573386e5ee0c63d8f4bebb3984fc6385bcb90 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Sat, 4 Feb 2012 10:02:59 +0000 Subject: 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 --- source/blender/blenfont/CMakeLists.txt | 2 ++ source/blender/blenfont/SConscript | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/blenfont') 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') -- cgit v1.2.3