Changeset 153 for cafu/trunk/SConstruct

Timestamp:

09/09/10 01:28:29 (21 months ago)

Author:

Carsten

Message:

Merged the latest changes in vendor/openal-win to cafu/trunk/ExtLibs/openal-win,
adding the 64-bit editions of the OpenAL DLLs.

Note that this implements the "Vendor Branches" strategy described in the Subversion book at
 http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html
 http://svnbook.red-bean.com/nightly/en/svn.advanced.vendorbr.html

Files:

• cafu/trunk/SConstruct (modified) (1 diff)

cafu/trunk/SConstruct

@@ -267 +267 @@
     if envCommon["TARGET_ARCH"]=="x86":
         envRelease.Install(".", ["#/ExtLibs/Cg/bin/cg.dll", "#/ExtLibs/Cg/bin/cgGL.dll"]);
+        envRelease.Install(".", ["#/ExtLibs/openal-win/libs/Win32/OpenAL32.dll", "#/ExtLibs/openal-win/libs/Win32/wrap_oal.dll"]);
         envRelease.Install(".", ["#/ExtLibs/fmod/api/fmod.dll"]);
     else:
         envRelease.Install(".", ["#/ExtLibs/Cg/bin.x64/cg.dll", "#/ExtLibs/Cg/bin.x64/cgGL.dll"]);
-
-    envRelease.Install(".", ["#/ExtLibs/openal-win/OpenAL32.dll", "#/ExtLibs/openal-win/wrap_oal.dll"]);
+        envRelease.Install(".", ["#/ExtLibs/openal-win/libs/Win64/OpenAL32.dll", "#/ExtLibs/openal-win/libs/Win64/wrap_oal.dll"]);
 
     if "r" in BVs: