diff options
| author | Stefan Gartner <stefang@aon.at> | 2004-01-08 19:14:09 +0300 |
|---|---|---|
| committer | Stefan Gartner <stefang@aon.at> | 2004-01-08 19:14:09 +0300 |
| commit | 2830db381e2cc9be32b465b439ee8c45a9ab8da4 (patch) | |
| tree | cad67530f3581d7f47e4e966106be0f319208f89 /SConstruct | |
| parent | 71597eb06143fbaf85a36e9fcf261a08b9b4668e (diff) | |
fix building with quicktime support on os x.
some platform specific sections had link_env.Append(CPPDEFINES=defines)
(darwin was not one of them). I moved that line to the global part of
SConstruct and added "defines = []" to the platforms that didn't have
it (sunos and hp-ux). I hope I didn't break anything...
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 904f4b34cee..10e33dc6894 100644 --- a/SConstruct +++ b/SConstruct @@ -60,6 +60,8 @@ elif sys.platform == 'darwin': extra_flags = ['-pipe', '-fPIC', '-funsigned-char'] cxxflags = [] defines = ['_THREAD_SAFE'] + if use_quicktime == 'true': + defines += ['WITH_QUICKTIME'] warn_flags = ['-Wall', '-W'] release_flags = [] debug_flags = ['-g'] @@ -182,10 +184,10 @@ elif sys.platform == 'win32': 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' + defines = [] elif string.find (sys.platform, 'irix') != -1: use_international = 'false' @@ -225,6 +227,7 @@ elif string.find (sys.platform, 'irix') != -1: elif string.find (sys.platform, 'hp-ux') != -1: window_system = 'X11' + defines = [] else: print "Unknown platform" @@ -291,6 +294,7 @@ libraries = (['blender_render', link_env.Append (LIBS=libraries) link_env.Append (LIBPATH=libpath) +link_env.Append (CPPDEFINES=defines) if use_international == 'true': link_env.Append (LIBS=['blender_FTF']) |