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

Cmake version bump, cleanup, typo fixes, rewrite of fmodex.cmake.

Browse Source
This commit is contained in:
Shyotl
2015-01-22 02:39:45 -06:00
parent c708408f64
commit ca98523c41
7 changed files with 137 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/CMakeLists.txt
View File

@@ -1402,16 +1402,6 @@ if (WINDOWS)
list(APPEND viewer_SOURCE_FILES ${viewer_INSTALLER_FILES})
endif (WINDOWS)
if (FMODSTUDIO)
set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMODSTUDIO")
endif (FMODSTUDIO)
if (FMODEX)
set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMODEX")
endif (FMODEX)
if (OPENAL)
set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_OPENAL")
endif (OPENAL)
set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")
list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
@@ -1442,9 +1432,9 @@ if(FMOD_LIBRARY_RELEASE)
add_custom_target(fmod_lib_copy DEPENDS fmod_lib.marker prepare)
if(DARWIN)
add_custom_command(OUTPUT fmod_lib_install.marker
COMMAND install_name_tool -id "@executable_path/../Resources/$<$<NOT:$<CONFIG:debug>>:${fmod_lib_rel_name}>$<$<CONFIG:debug>:${FMOD_LIBRARY_DEBUG}>" "${CMAKE_CFG_INTDIR}/$<$<NOT:$<CONFIG:debug>>:${fmod_lib_rel_name}>$<$<CONFIG:debug>:${fmod_lib_deb_name}>"
COMMAND install_name_tool -id "@executable_path/../Resources/$<$<NOT:$<CONFIG:debug>>:${fmod_lib_rel_name}>$<$<CONFIG:debug>:${FMOD_LIBRARY_DEBUG}>" "${CMAKE_CFG_INTDIR}/$<$<NOT:$<CONFIG:debug>>:${fmod_lib_rel_name}>$<$<CONFIG:debug>:${fmod_lib_deb_name}>"
DEPENDS fmod_lib.marker)
add_dependencies(fmod_lib_copy fmod_lib_install.marker)
add_dependencies(fmod_lib_copy fmod_lib_install.marker)
endif(DARWIN)
add_dependencies(${VIEWER_BINARY_NAME} fmod_lib_copy)

13
indra/newview/viewer_manifest.py
View File

@@ -210,7 +210,7 @@ class ViewerManifest(LLManifest):
except:
config, file = (None, None)
if(config == 'optimized'):
if(self.args['configuration'].lower() != 'release' and self.args['configuration'].lower() != 'relwithdebinfo'):
if(self.args['configuration'].lower() != 'release' and self.args['configuration'].lower() != 'relwithdebinfo' and self.args['configuration'].lower() != 'universal'):
continue
cur_path = file
if(config == 'debug'):
@@ -218,7 +218,10 @@ class ViewerManifest(LLManifest):
continue
cur_path = file
if(cur_path != ''):
found_libs += self.path_optional(cur_path)
if sys.platform == "linux" or sys.platform == "linux2":
found_libs += self.path_optional(cur_path+"*")
else:
found_libs += self.path_optional(cur_path)
return found_libs
class WindowsManifest(ViewerManifest):
@@ -578,7 +581,7 @@ class DarwinManifest(ViewerManifest):
self.end_prefix()
if self.prefix(src=self.args['configuration'], alt_build=libdir):
if self.prefix(src= '' if self.args['configuration'].lower() == 'universal' else self.args['configuration'], alt_build=libdir):
dylibs += self.add_extra_libraries()
self.end_prefix()
@@ -880,7 +883,7 @@ class Linux_i686Manifest(LinuxManifest):
self.end_prefix("lib")
if (not self.standalone()) and self.prefix(src=self.args['configuration'], alt_build="../packages/lib/release", dst="lib"):
if (not self.standalone()) and self.prefix(src='', alt_build="../packages/lib/release", dst="lib"):
self.add_extra_libraries()
self.end_prefix()
@@ -932,7 +935,7 @@ class Linux_x86_64Manifest(LinuxManifest):
self.end_prefix("lib")
if (not self.standalone()) and self.prefix(src=self.args['configuration'], alt_build="../packages/lib/release", dst="lib"):
if (not self.standalone()) and self.prefix(src='', alt_build="../packages/lib/release", dst="lib"):
self.add_extra_libraries()
self.end_prefix()