diff options
| author | Michel Selten <michel@mselten.demon.nl> | 2004-02-23 17:39:08 +0300 |
|---|---|---|
| committer | Michel Selten <michel@mselten.demon.nl> | 2004-02-23 17:39:08 +0300 |
| commit | 874d454d67a25ac0a00ba558572c25342cdbaa3c (patch) | |
| tree | f14c2a72a04217d6ed314439dc7606232c2d2bd6 /source/blender | |
| parent | d9cf17d930a86445b9a1562458e243cc4fc8c73e (diff) | |
SCons updates
* Removed the I18N_DEFINES from the config.opts file. This define is not a
user setting. The defines depend on what options the user enables in the top
of the config.opts file (USE_INTERNATIONAL).
* Moved the defines to the correct SConscript files.
Only the relevant libraries now use these defines.
* Windows fix for the python settings. There were missing brackets [ and ] for
these settings.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/blenlib/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/ftfont/SConscript | 1 | ||||
| -rw-r--r-- | source/blender/src/SConscript | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 7f151f68e26..479980673d2 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -58,4 +58,7 @@ blenkernel_env.Append (CPPPATH = ['.', '#/intern/iksolver/extern', '../blenloader']) +if user_options_dict['USE_INTERNATIONAL'] == 1: + blenkernel_env.Append (CPPDEFINES = 'WITH_FREETYPE2') + blenkernel_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenkernel', source=source_files) diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 9b091fc7c7f..bc36cd234e6 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -38,6 +38,9 @@ blenlib_env.Append (CPPPATH = ['.', '#/intern/guardedalloc', '../include']) +if user_options_dict['USE_INTERNATIONAL'] == 1: + blenlib_env.Append (CPPDEFINES = 'WITH_FREETYPE2') + blenlib_env.Append (CPPPATH = extra_includes) blenlib_env.Prepend (CPPPATH = user_options_dict['FREETYPE_INCLUDE']) blenlib_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_blenlib', source=source_files) diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript index 3cde8d6346b..8cfe4223f1b 100644 --- a/source/blender/ftfont/SConscript +++ b/source/blender/ftfont/SConscript @@ -22,4 +22,5 @@ ftf_env.Prepend (CPPPATH = user_options_dict['GETTEXT_INCLUDE']) ftf_env.Append(CCFLAGS = cflags) ftf_env.Append(CXXFLAGS = cxxflags) ftf_env.Append(CPPDEFINES = defines) +ftf_env.Append(CPPDEFINES = 'FTGL_STATIC_LIBRARY') ftf_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_FTF', source=source_files) diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index 68ed7ef0077..91c75559f2c 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -140,6 +140,8 @@ src_env.Append (CPPPATH = user_options_dict['SDL_INCLUDE']) if user_options_dict['USE_INTERNATIONAL'] == 1: src_env.Append (CPPPATH=['../ftfont']) + src_env.Append (CPPDEFINES = 'INTERNATIONAL') + src_env.Append (CPPDEFINES = 'FTGL_STATIC_LIBRARY') src_env.Append (CPPPATH=extra_includes) |