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

FMOD(STUDIO|EX)_SDK_DIR wasn't being properly set. Change fallback on missing msvc*, as the old code made no sense (wildcarded paths don't throw when not found)

Browse Source
This commit is contained in:
Shyotl
2014-12-29 18:59:15 -06:00
parent 2d2513369a
commit a891d2fdea
3 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/cmake/FMODEX.cmake
View File

@@ -8,16 +8,12 @@ endif (FMODEX AND FMODSTUDIO)
unset(FMOD_LIBRARY_RELEASE CACHE)
unset(FMOD_LIBRARY_DEBUG CACHE)
unset(FMOD_LINK_LIBRARY_RELEASE CACHE)
unset(FMOD_LINK_LIBRARY_DEBUG CACHE)
unset(FMOD_INCLUDE_DIR CACHE)
if (NOT FMODEX_SDK_DIR)
set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
if(WINDOWS)
GET_FILENAME_COMPONENT(FMODEX_SDK_DIR [HKEY_CURRENT_USER\\Software\\FMOD\ Programmers\ API\ Windows] ABSOLUTE CACHE)
endif(WINDOWS)
endif (NOT FMODEX_SDK_DIR)
if (NOT FMODEX_SDK_DIR AND WINDOWS)
GET_FILENAME_COMPONENT(REG_DIR [HKEY_CURRENT_USER\\Software\\FMOD\ Programmers\ API\ Windows] ABSOLUTE)
set(FMODEX_SDK_DIR ${REG_DIR} CACHE PATH "Path to the FMOD Ex SDK." FORCE)
endif (NOT FMODEX_SDK_DIR AND WINDOWS)
set(release_fmod_lib_paths
${LIBS_PREBUILT_DIR}/release/lib/
@@ -64,22 +60,16 @@ endif(WINDOWS)
find_path(FMOD_INCLUDE_DIR fmod.hpp ${fmod_inc_paths})
if (FMOD_LIBRARY_RELEASE AND FMOD_INCLUDE_DIR)
set(FMOD ON CACHE BOOL "Use closed source FMOD sound library.")
set(FMOD ON)
if (NOT FMOD_LIBRARY_DEBUG) #Use release library in debug configuration if debug library is absent.
set(FMOD_LIBRARY_DEBUG ${FMOD_LIBRARY_RELEASE})
endif (NOT FMOD_LIBRARY_DEBUG)
else (FMOD_LIBRARY_RELEASE AND FMOD_INCLUDE_DIR)
unset(FMOD_LIBRARY_RELEASE CACHE)
unset(FMOD_LIBRARY_DEBUG CACHE)
unset(FMOD_INCLUDE_DIR CACHE)
if (FMOD)
message(STATUS "No support for FMOD Ex audio (need to set FMODEX_SDK_DIR?)")
endif (FMOD)
set(FMOD OFF CACHE BOOL "Use closed source FMOD sound library.")
message(STATUS "No support for FMOD Ex audio (need to set FMODEX_SDK_DIR?)")
set(FMOD OFF)
set(FMODEX OFF)
endif (FMOD_LIBRARY_RELEASE AND FMOD_INCLUDE_DIR)
if (FMOD)
message(STATUS "Building with FMOD audio support")
message(STATUS "Building with FMOD Ex audio support")
endif (FMOD)

24
indra/cmake/FMODSTUDIO.cmake
View File

@@ -8,16 +8,12 @@ endif (FMODEX AND FMODSTUDIO)
unset(FMOD_LIBRARY_RELEASE CACHE)
unset(FMOD_LIBRARY_DEBUG CACHE)
unset(FMOD_LINK_LIBRARY_RELEASE CACHE)
unset(FMOD_LINK_LIBRARY_DEBUG CACHE)
unset(FMOD_INCLUDE_DIR CACHE)
if (NOT FMODSTUDIO_SDK_DIR)
set(FMODSTUDIO_SDK_DIR CACHE PATH "Path to the FMOD Studio SDK.")
if(WINDOWS)
GET_FILENAME_COMPONENT(FMODSTUDIO_SDK_DIR [HKEY_CURRENT_USER\\Software\\FMOD\ Studio\ API\ Windows] ABSOLUTE CACHE)
endif(WINDOWS)
endif (NOT FMODSTUDIO_SDK_DIR)
if (NOT FMODSTUDIO_SDK_DIR AND WINDOWS)
GET_FILENAME_COMPONENT(REG_DIR [HKEY_CURRENT_USER\\Software\\FMOD\ Studio\ API\ Windows] ABSOLUTE)
set(FMODSTUDIO_SDK_DIR ${REG_DIR} CACHE PATH "Path to the FMOD Studio SDK." FORCE)
endif (NOT FMODSTUDIO_SDK_DIR AND WINDOWS)
set(release_fmod_lib_paths
${LIBS_PREBUILT_DIR}/release/lib/
@@ -67,22 +63,16 @@ endif(WINDOWS)
find_path(FMOD_INCLUDE_DIR fmod.hpp ${fmod_inc_paths})
if (FMOD_LIBRARY_RELEASE AND FMOD_INCLUDE_DIR)
set(FMOD ON CACHE BOOL "Use closed source FMOD sound library.")
set(FMOD ON)
if (NOT FMOD_LIBRARY_DEBUG) #Use release library in debug configuration if debug library is absent.
set(FMOD_LIBRARY_DEBUG ${FMOD_LIBRARY_RELEASE})
endif (NOT FMOD_LIBRARY_DEBUG)
else (FMOD_LIBRARY_RELEASE AND FMOD_INCLUDE_DIR)
unset(FMOD_LIBRARY_RELEASE CACHE)
unset(FMOD_LIBRARY_DEBUG CACHE)
unset(FMOD_INCLUDE_DIR CACHE)
if (FMOD)
message(STATUS "No support for FMOD Studio audio (need to set FMODSTUDIO_SDK_DIR?)")
endif (FMOD)
set(FMOD OFF CACHE BOOL "Use closed source FMOD sound library.")
message(STATUS "No support for FMOD Studio audio (need to set FMODSTUDIO_SDK_DIR?)")
set(FMOD OFF)
set(FMODSTUDIO OFF)
endif (FMOD_LIBRARY_RELEASE AND FMOD_INCLUDE_DIR)
if (FMOD)
message(STATUS "Building with FMOD audio support")
message(STATUS "Building with FMOD Studio audio support")
endif (FMOD)

21
indra/newview/viewer_manifest.py
View File

@@ -264,16 +264,17 @@ class WindowsManifest(ViewerManifest):
self.add_extra_libraries()
try:
self.path("msvc*.dll")
except:
try:
if self.prefix(src="msvcrt", dst=""):
self.path("*.dll")
self.path("*.manifest")
self.end_prefix()
except:
pass
if(self.prefix(src="..", dst="")):
found_files = self.path("msvc*.dll")
self.end_prefix()
if(not found_files):
try:
if self.prefix(src="msvcrt", dst=""):
self.path("*.dll")
self.path("*.manifest")
self.end_prefix()
except:
pass
# Vivox runtimes
self.path("SLVoice.exe")