From a66108134c72bf05a02f8a76e6305efeb6f5eb62 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 5 Jan 2004 18:17:23 +0000 Subject: - 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. --- intern/SoundSystem/SConscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'intern') 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'] -- cgit v1.2.3