diff options
| -rw-r--r-- | source/blender/blenfont/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | source/blender/blenfont/SConscript | 4 |
2 files changed, 17 insertions, 5 deletions
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index cd91bf69c91..e5019b53718 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -24,15 +24,23 @@ FILE(GLOB SRC intern/*.c) -#SET(INC . intern ../../../intern/guardedalloc ../blenlib ../blenkernel ../makedna - SET(INC - ../../../intern/guardedalloc ../blenlib ../makesdna - ../blenkernel ../ftfont + ../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include + ../blenkernel ../ftfont ../../../extern/glew/include + ${FTGL_INC} + ${FREETYPE_INC} + ${GETTEXT_INC} ) +ADD_DEFINITIONS(-DFTGL_LIBRARY_STATIC) + IF(WITH_INTERNATIONAL) ADD_DEFINITIONS(-DWITH_FREETYPE2) ENDIF(WITH_INTERNATIONAL) -BLENDERLIB(bf_blenfont "${SRC}" "${INC}")
\ No newline at end of file +IF(WIN32) + ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL) +ENDIF(WIN32) + +BLENDERLIB(bf_blenfont "${SRC}" "${INC}") + diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index fb162cdd80b..42ccfc8e2ed 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -15,4 +15,8 @@ defs = '' if env['WITH_BF_INTERNATIONAL']: defs += ' WITH_FREETYPE2' +defs = 'FTGL_STATIC_LIBRARY' +if sys.platform == 'win32': + defs += ' _WIN32 USE_GETTEXT_DLL' + env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core'], priority=[210] ) |