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>2008-03-07 00:01:55 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2008-03-07 00:01:55 +0300
commit3796abf092c9de4d43131dbce05102b126e14896 (patch)
tree7893ba6005950e1770ab72b86b615a69f6f3ef56 /config/win32-mingw-config.py
parente179b3d98e4d26636d5f6becafa3a2129cc04fea (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/win32-mingw-config.py')
-rw-r--r--config/win32-mingw-config.py4
1 files changed, 2 insertions, 2 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'