Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2004-01-05 21:17:23 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2004-01-05 21:17:23 +0300
commita66108134c72bf05a02f8a76e6305efeb6f5eb62 (patch)
tree79db39eeef8ab3a6a37d9a81d164e4361ba3a01a /SConstruct
parenta017282b62294e8faaa4d95ff41e722398bfdd0a (diff)
- Added the SConscripts for ftfont and quicktime
- [win32] python_include was missing, there was a double python_libpath. Corrected - [win32] the soundsystem SConscript broke the win32 build.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct4
1 files changed, 3 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index 3b8527f7c77..3742f9482f6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -119,6 +119,7 @@ elif sys.platform == 'win32':
cxxflags = []
defines = ['WIN32', 'NDEBUG', '_CONSOLE', 'FTGL_STATIC_LIBRARY']
defines += ['GAME_BLENDER=0', 'INTERNATIONAL', 'WITH_QUICKTIME']
+ defines += ['_LIB', 'WITH_FREETYPE2']
warn_flags = []
platform_libs = ['SDL', 'freetype2ST', 'ftgl_static_ST', 'gnu_gettext',
'qtmlClient', 'odelib', 'openal_static', 'soundsystem',
@@ -170,9 +171,10 @@ elif sys.platform == 'win32':
sdl_cflags = ''
window_system = 'WIN32'
# Python lib name
- python_libpath = '#../lib/windows/python/include'
+ python_include = '#../lib/windows/python/include/python2.2'
python_libpath = '#../lib/windows/python/lib'
python_lib = 'python22'
+ link_env.Append (CPPDEFINES = defines)
elif string.find (sys.platform, 'sunos') != -1:
window_system = 'X11'