livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FMOD Studio 2.00.01 for Windows

meow-7.2.2
Ansariel 2019-06-08 15:00:23 +02:00
parent a4a8f7e228
commit dd05edde98
4 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autobuild.xml
View File

@ -1048,11 +1048,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>9aa1b6789b0f30943599f48c0fedefa1</string>
<string>f44299c9cf9c4224c6aee350284c3175</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-1.10.13-windows-191311251.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.00.01-windows-191591202.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1062,18 +1062,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>7e6e5b4bc012e0f91c71c481aa4657fb</string>
<string>fd45c9663bbd413f779b3bd5ad6f3567</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-1.10.13-windows64-191311303.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.00.01-windows64-191591204.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.10.13</string>
<string>2.00.01</string>
</map>
<key>fmodex</key>
<map>

10
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -65,17 +65,11 @@ if(WINDOWS)
set(release_files ${release_files} growl++.dll growl.dll )
if (FMODSTUDIO)
if(ADDRESS_SIZE EQUAL 32)
set(debug_files ${debug_files} fmodL.dll)
set(release_files ${release_files} fmod.dll)
else(ADDRESS_SIZE EQUAL 32)
set(debug_files ${debug_files} fmodL64.dll)
set(release_files ${release_files} fmod64.dll)
endif(ADDRESS_SIZE EQUAL 32)
set(debug_files ${debug_files} fmodL.dll)
set(release_files ${release_files} fmod.dll)
endif (FMODSTUDIO)
if (FMODEX)
if(ADDRESS_SIZE EQUAL 32)
set(release_files ${release_files} fmodex.dll)
else(ADDRESS_SIZE EQUAL 32)

12
indra/cmake/FMODSTUDIO.cmake
View File

@ -27,15 +27,9 @@ if (FMODSTUDIO)
include(Prebuilt)
use_prebuilt_binary(fmodstudio)
if (WINDOWS)
if (ADDRESS_SIZE EQUAL 32)
set(FMODSTUDIO_LIBRARY
debug fmodL_vc
optimized fmod_vc)
elseif (ADDRESS_SIZE EQUAL 64)
set(FMODSTUDIO_LIBRARY
debug fmodL64_vc
optimized fmod64_vc)
endif(ADDRESS_SIZE EQUAL 32)
set(FMODSTUDIO_LIBRARY
debug fmodL_vc
optimized fmod_vc)
elseif (DARWIN)
set(FMODSTUDIO_LIBRARY
debug fmodL

10
indra/newview/viewer_manifest.py
View File

@ -602,15 +602,9 @@ class WindowsManifest(ViewerManifest):
# Get fmodstudio dll, continue if missing
try:
if self.args['configuration'].lower() == 'debug':
if(self.address_size == 64):
self.path("fmodL64.dll")
else:
self.path("fmodL.dll")
self.path("fmodL.dll")
else:
if(self.address_size == 64):
self.path("fmod64.dll")
else:
self.path("fmod.dll")
self.path("fmod.dll")
except:
print "Skipping fmodstudio audio library (assuming other audio engine)"