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
path: root/config
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2009-08-06 12:23:07 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2009-08-06 12:23:07 +0400
commit1e4fb484001994f4e164aab7b44c9578df59f67d (patch)
treef72f04d07def54bf8fe535eab89cac06e9685249 /config
parent6f1ec5e3b941bd94b6c1838845f4bc8609b91312 (diff)
* update windows default config for the openal updates, merging r22241 from soundsystem branch
Diffstat (limited to 'config')
-rw-r--r--config/win32-vc-config.py2
-rw-r--r--config/win64-vc-config.py5
2 files changed, 2 insertions, 5 deletions
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 4df15c691c2..30239579567 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -19,7 +19,7 @@ WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = False
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
-BF_OPENAL_LIB = 'dxguid openal_static'
+BF_OPENAL_LIB = 'OpenAL32 wrap_oal' #'dxguid openal_static'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
diff --git a/config/win64-vc-config.py b/config/win64-vc-config.py
index a8be162ea97..12f89e08482 100644
--- a/config/win64-vc-config.py
+++ b/config/win64-vc-config.py
@@ -16,13 +16,10 @@ BF_PYTHON_LIB = 'python31'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
WITH_BF_OPENAL = False
-WITH_BF_STATICOPENAL = False
BF_OPENAL = LIBDIR + '/openal'
BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
-BF_OPENAL_LIB = 'dxguid openal_static'
+BF_OPENAL_LIB = 'OpenAL32 wrap_oal' #'dxguid openal_static'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
-# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
# TODO - are these useful on win32?
# BF_CXX = '/usr'