[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13991] trunk/blender: * on win32 with msvc USE_OPENAL was defined for the entire source.

[Nathan Letwory]

Revision: 13991
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13991
Author:   jesterking
Date:     2008-03-06 22:01:55 +0100 (Thu, 06 Mar 2008)

Log Message:
-----------
* on win32 with msvc USE_OPENAL was defined for the entire source. Made it so that it is defined only there where needed when needed.
* dxguid is necessary only when building WITH_BF_OPENAL=1. I already added the mingw version to our SVN in lib/windows/openal/lib and now I made sure it is linked against only when needed.

Modified Paths:
--------------
    trunk/blender/config/win32-mingw-config.py
    trunk/blender/config/win32-vc-config.py
    trunk/blender/intern/SoundSystem/SConscript

Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py	2008-03-06 20:58:46 UTC (rev 13990)
+++ trunk/blender/config/win32-mingw-config.py	2008-03-06 21:01:55 UTC (rev 13991)
@@ -14,7 +14,7 @@
 WITH_BF_OPENAL = 'true'
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal_static'
+BF_OPENAL_LIB = 'dxguid openal_static'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = 'false'
@@ -151,7 +151,7 @@
 
 CC_WARN = [ '-Wall' ]
 
-LLIBS = ['-lshell32', '-lshfolder', '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
+LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
 
 BF_DEBUG = 'false'
 BF_DEBUG_FLAGS= '-g'

Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py	2008-03-06 20:58:46 UTC (rev 13990)
+++ trunk/blender/config/win32-vc-config.py	2008-03-06 21:01:55 UTC (rev 13991)
@@ -21,7 +21,7 @@
 WITH_BF_OPENAL = 'true'
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
-BF_OPENAL_LIB = 'openal_static'
+BF_OPENAL_LIB = 'dxguid openal_static'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_ICONV = 'true'
@@ -151,13 +151,13 @@
 
 BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET}.sbr']
 
-CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DUSE_OPENAL', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
+CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
 REL_CFLAGS = ['-O2', '-DNDEBUG']
 REL_CCFLAGS = ['-O2', '-DNDEBUG']
 C_WARN = []
 CC_WARN = []
 
-LLIBS = 'ws2_32 dxguid vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid'
+LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid'
 
 PLATFORM_LINKFLAGS = '''
                         /SUBSYSTEM:CONSOLE 

Modified: trunk/blender/intern/SoundSystem/SConscript
===================================================================
--- trunk/blender/intern/SoundSystem/SConscript	2008-03-06 20:58:46 UTC (rev 13990)
+++ trunk/blender/intern/SoundSystem/SConscript	2008-03-06 21:01:55 UTC (rev 13991)
@@ -7,10 +7,11 @@
 incs = '. intern ../moto/include ../string dummy openal sdl'
 defs = ''
 if env['WITH_BF_OPENAL']:
-    sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp')
-    incs += ' ' + env['BF_OPENAL_INC']
-    incs += ' ' + env['BF_SDL_INC']
+	sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp')
+	incs += ' ' + env['BF_OPENAL_INC']
+	incs += ' ' + env['BF_SDL_INC']
+	defs = 'USE_OPENAL'
 else:
-    defs = 'NO_SOUND'
+	defs = 'NO_SOUND'
 
 env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [20,140] )