Revision: 19016 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19016 Author: blendix Date: 2009-02-17 21:16:09 +0100 (Tue, 17 Feb 2009)
Log Message: ----------- 2.5: CMake update for blenfont module, also some flags for scons to make it compatible with makefiles and ftfont module. Modified Paths: -------------- branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt branches/blender2.5/blender/source/blender/blenfont/SConscript Modified: branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt =================================================================== --- branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt 2009-02-17 19:57:05 UTC (rev 19015) +++ branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt 2009-02-17 20:16:09 UTC (rev 19016) @@ -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}") + Modified: branches/blender2.5/blender/source/blender/blenfont/SConscript =================================================================== --- branches/blender2.5/blender/source/blender/blenfont/SConscript 2009-02-17 19:57:05 UTC (rev 19015) +++ branches/blender2.5/blender/source/blender/blenfont/SConscript 2009-02-17 20:16:09 UTC (rev 19016) @@ -15,4 +15,8 @@ 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] ) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs