diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-10-06 15:18:42 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-10-06 15:18:42 -0700 |
| commit | 96f5b76bc2b6ea7cfef3ae9db4f2bc113d9bebcf (patch) | |
| tree | 7328703b707b696dc1e388440b9fb47aa80af2e2 | |
| parent | 70edaea49cc10a3817dc60c49402afe4c6212df8 (diff) | |
Fix for DEV-40872: eliminate dependency on libfmodwrapper.so on linux.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a81b91df83..227502a78d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1274,11 +1274,10 @@ endif (OPENAL) if (FMOD) set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_FMOD") - if (NOT WINDOWS) + if (DARWIN) set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp) add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES}) set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY}) - if (DARWIN) list(APPEND fmodwrapper_needed_LIBRARIES ${CARBON_LIBRARY}) set_target_properties( fmodwrapper @@ -1287,10 +1286,12 @@ if (FMOD) INSTALL_NAME_DIR "@executable_path/../Resources" LINK_FLAGS "-unexported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp" ) - endif (DARWIN) set(FMODWRAPPER_LIBRARY fmodwrapper) target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES}) - endif (NOT WINDOWS) + elseif (LINUX) + # no longer using fmodwrapper itself on linux + set(FMODWRAPPER_LIBRARY ${FMOD_LIBRARY}) + endif (DARWIN) endif (FMOD) set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}") |