diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 19:27:40 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-10-07 19:27:40 -0700 |
| commit | 608169c1b73d6cec07dfa1e0a8f186092ed2405e (patch) | |
| tree | 53fbc9ab3c3c4a5d07034c9d455474f9b7147c41 | |
| parent | 902d6676c653ce2ca34b3645576e59bcc93dc2cd (diff) | |
Cleaned up my earlier fmodwrapper work (DEV-40872) based on nat and moss's code reviews.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 57cfe80cb8..eb2c7688f9 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1144,7 +1144,6 @@ if (WINDOWS) comdlg32 ${DINPUT_LIBRARY} ${DXGUID_LIBRARY} - fmodvc kernel32 odbc32 odbccp32 @@ -1273,19 +1272,18 @@ if (FMOD) if (DARWIN) set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp) add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES}) - set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY}) - list(APPEND fmodwrapper_needed_LIBRARIES ${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_needed_LIBRARIES ${FMOD_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}) - elseif (LINUX) - # no longer using fmodwrapper itself on linux + else (DARWIN) + # fmodwrapper unnecessary on linux or windows set(FMODWRAPPER_LIBRARY ${FMOD_LIBRARY}) endif (DARWIN) endif (FMOD) |