diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-03-07 00:01:55 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-03-07 00:01:55 +0300 |
| commit | 3796abf092c9de4d43131dbce05102b126e14896 (patch) | |
| tree | 7893ba6005950e1770ab72b86b615a69f6f3ef56 /config | |
| parent | e179b3d98e4d26636d5f6becafa3a2129cc04fea (diff) | |
* 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.
Diffstat (limited to 'config')
| -rw-r--r-- | config/win32-mingw-config.py | 4 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index fa6b12ab138..d9fd6ce8d4f 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -14,7 +14,7 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' 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 @@ C_WARN = [ '-Wall' , '-Wno-char-subscripts', '-Wdeclaration-after-statement' ] 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' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 8044617814c..1b75f981a37 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -21,7 +21,7 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' 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 @@ CCFLAGS = ['/nologo', '/Og', '/Ot', '/Ob1', '/Op', '/G6','/EHsc', '/J', '/W3', ' 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 |