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:
Diffstat (limited to 'intern/SoundSystem/SConscript')
-rw-r--r--intern/SoundSystem/SConscript12
1 files changed, 2 insertions, 10 deletions
diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript
index 89a0716dc85..6da9be3dd9a 100644
--- a/intern/SoundSystem/SConscript
+++ b/intern/SoundSystem/SConscript
@@ -1,17 +1,10 @@
-# TODO: Add the options for building with fmod and/or OpenAL
import sys
-soundsys_env = Environment()
-
-# Import the C flags set in the SConstruct file
-Import ('cflags')
-Import ('cxxflags')
-Import ('defines')
Import ('user_options_dict')
Import ('extra_includes')
+Import ('library_env')
-soundsys_env.Append (CCFLAGS = cflags)
-soundsys_env.Append (CXXFLAGS = cxxflags)
+soundsys_env = library_env.Copy ()
source_files = ['dummy/SND_DummyDevice.cpp',
'intern/SND_AudioDevice.cpp',
@@ -39,7 +32,6 @@ if user_options_dict['USE_OPENAL'] == 1:
soundsys_env.Append (CPPPATH=user_options_dict['OPENAL_INCLUDE'])
if sys.platform=='win32':
defines += ['_LIB']
- soundsys_env.Append(CPPDEFINES = defines)
if user_options_dict['USE_FMOD'] == 1:
source_files += ['fmod/SND_FmodDevice.cpp']