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 /intern/SoundSystem
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 'intern/SoundSystem')
-rw-r--r--intern/SoundSystem/SConscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript
index ce9ab8c1882..d6d87213962 100644
--- a/intern/SoundSystem/SConscript
+++ b/intern/SoundSystem/SConscript
@@ -13,7 +13,6 @@ Import ('extra_includes')
soundsys_env.Append (CCFLAGS = cflags)
soundsys_env.Append (CXXFLAGS = cxxflags)
-soundsys_env.Append (CPPDEFINES = defines)
source_files = ['dummy/SND_DummyDevice.cpp',
'intern/SND_AudioDevice.cpp',
@@ -39,7 +38,9 @@ if use_openal == 'true':
source_files += ['openal/SND_OpenALDevice.cpp',
'openal/pthread_cancel.cpp']
if sys.platform=='win32':
- cflags += ' /D_LIB'
+ defines += ['_LIB']
+ soundsys_env.Append(CPPDEFINES = defines)
+
if use_fmod == 'true':
source_files += ['fmod/SND_FmodDevice.cpp']