Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make fmod2.0 compiling

Browse Source 
Signed-off-by: Lirusaito <inusaito@gmail.com>
Added libraries to autobuild, mac build from Bitten
This commit is contained in:
Naiyako
2019-07-03 22:31:31 +02:00
committed by Lirusaito
parent b9e522fd8d
commit 4a6a81b5d4
4 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
autobuild.xml
View File

@@ -818,11 +818,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>a3ccf7916d1e0b6f01370978b661c139</string>
<string>d1ede6c7be5db022897b44830cb5b095</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>https://depot.alchemyviewer.org/pub/darwin/lib/fmodstudio-1.10.02-darwin-201712262058.tar.bz2</string>
<string>https://bitbucket.org/SingularityViewer/libraries/downloads/fmodstudio-2.00.02.191841858-darwin64-191841858.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -860,11 +860,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b23a30967666da49346983658ed50e92</string>
<string>2e18d5c43fad15d869dd96860f1e1871</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>https://depot.alchemyviewer.org/pub/windows/lib/fmodstudio-1.10.00-windows-201709290225.tar.bz2</string>
<string>https://bitbucket.org/SingularityViewer/libraries/downloads/fmodstudio-2.00.02-windows-191832253.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -874,11 +874,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>779ae33c6b84656295bd6cf50a69c830</string>
<string>6146c96719680c2f1a8aaab1dabdef8e</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://depot.alchemyviewer.org/pub/packages/windows64/msvc/fmodstudio-1.10.10.190360453-windows64-190360453.tar.bz2</string>
<string>https://bitbucket.org/SingularityViewer/libraries/downloads/fmodstudio-2.00.02-windows64-191832321.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>

9
indra/cmake/Copy3rdPartyLibs.cmake
View File

@@ -83,13 +83,8 @@ if(WINDOWS)
endif(NOT DISABLE_TCMALLOC)
if (FMODSTUDIO)
if(ADDRESS_SIZE STREQUAL 64)
set(debug_files ${debug_files} fmodL64.dll)
set(release_files ${release_files} fmod64.dll)
else(ADDRESS_SIZE STREQUAL 64)
set(debug_files ${debug_files} fmodL.dll)
set(release_files ${release_files} fmod.dll)
endif(ADDRESS_SIZE STREQUAL 64)
set(debug_files ${debug_files} fmodL.dll)
set(release_files ${release_files} fmod.dll)
endif (FMODSTUDIO)
elseif(DARWIN)

9
indra/cmake/FMODSTUDIO.cmake
View File

@@ -11,13 +11,8 @@ if (FMODSTUDIO)
set(lib_suffix .so)
endif(WINDOWS)
if(WINDOWS)
if(WORD_SIZE EQUAL 64)
set(FMOD_LIBRARY_RELEASE ${LIBS_PREBUILT_DIR}/lib/release/fmod64${lib_suffix})
set(FMOD_LIBRARY_DEBUG ${LIBS_PREBUILT_DIR}/lib/debug/fmodL64${lib_suffix})
else(WORD_SIZE EQUAL 64)
set(FMOD_LIBRARY_RELEASE ${LIBS_PREBUILT_DIR}/lib/release/fmod${lib_suffix})
set(FMOD_LIBRARY_DEBUG ${LIBS_PREBUILT_DIR}/lib/debug/fmodL${lib_suffix})
endif(WORD_SIZE EQUAL 64)
set(FMOD_LIBRARY_RELEASE ${LIBS_PREBUILT_DIR}/lib/release/fmod${lib_suffix})
set(FMOD_LIBRARY_DEBUG ${LIBS_PREBUILT_DIR}/lib/debug/fmodL${lib_suffix})
else(WINDOWS)
set(FMOD_LIBRARY_RELEASE ${LIBS_PREBUILT_DIR}/lib/release/libfmod${lib_suffix})
set(FMOD_LIBRARY_DEBUG ${LIBS_PREBUILT_DIR}/lib/debug/libfmodL${lib_suffix})

12
indra/newview/viewer_manifest.py
View File

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