diff options
| author | Sovereign Engineer <sovereign.engineer@outlook.com> | 2013-02-04 08:24:35 -0500 |
|---|---|---|
| committer | Sovereign Engineer <sovereign.engineer@outlook.com> | 2013-02-04 08:24:35 -0500 |
| commit | 8cf1d6af0d576ad460e441a45a455fbb45bcb9a7 (patch) | |
| tree | 0dcbe760f6fedbbf4d9bd25c807aa9e1059f8319 | |
| parent | bc161b040a5f6817a9adcec759e48bf590c2ed45 (diff) | |
fmodwrapper uneeded with fmodex
| -rw-r--r-- | indra/newview/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 6 |
2 files changed, 2 insertions, 23 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 24a35bf8a2..b860b484dc 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1526,24 +1526,7 @@ endif (OPENAL) if (FMODEX) set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMODEX") - - if (DARWIN) - set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp) - add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES}) - set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY} ${CARBON_LIBRARY}) - set_target_properties( - fmodwrapper - PROPERTIES - BUILD_WITH_INSTALL_RPATH 1 - INSTALL_NAME_DIR "@executable_path/../Resources" - LINK_FLAGS "-unexported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp" - ) - set(FMODWRAPPER_LIBRARY fmodwrapper) - target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES}) - else (DARWIN) - # fmodwrapper unnecessary on linux or windows - set(FMODWRAPPER_LIBRARY ${FMODEX_LIBRARY}) - endif (DARWIN) + set(FMODWRAPPER_LIBRARY ${FMODEX_LIBRARY}) endif (FMODEX) set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}") diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 557c213787..6333c65047 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -762,11 +762,7 @@ class DarwinManifest(ViewerManifest): 'SLVoice', ): self.path2basename(libdir, libfile) - - # FMOD for sound - libfile = "libfmodwrapper.dylib" - path_optional(os.path.join(self.args['configuration'], libfile), libfile) - + # our apps for app_bld_dir, app in (("mac_crash_logger", "mac-crash-logger.app"), ("mac_updater", "mac-updater.app"), |