diff options
| -rw-r--r-- | indra/newview/CMakeLists.txt | 36 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 3 |
2 files changed, 19 insertions, 20 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index ebc02b2357..6d1e58d40c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1189,8 +1189,7 @@ if (FMOD) INSTALL_NAME_DIR "@executable_path/../Resources" ) endif (DARWIN) - set(FMODWRAPPER_LIBRARIES fmodwrapper) - list(APPEND viewer_LIBRARIES fmodwrapper) + set(FMODWRAPPER_LIBRARY fmodwrapper) target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES}) endif (NOT WINDOWS) endif (FMOD) @@ -1313,7 +1312,7 @@ target_link_libraries(secondlife-bin ${BOOST_REGEX_LIBRARY} ${BOOST_SIGNALS_LIBRARY} ${OPENGL_LIBRARIES} - ${FMODWRAPPER_LIBRARIES} + ${FMODWRAPPER_LIBRARY} ${OPENGL_LIBRARIES} ${MOZLIB_LIBRARIES} ${SDL_LIBRARY} @@ -1411,23 +1410,22 @@ if (DARWIN) DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) - add_custom_command( - OUTPUT ${CMAKE_CFG_INTDIR}/.${product}.touched - COMMAND ${PYTHON_EXECUTABLE} - ARGS - ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py - --configuration=${CMAKE_CFG_INTDIR} - --channel=${VIEWER_CHANNEL} - --source=${CMAKE_CURRENT_SOURCE_DIR} - --artwork=${ARTWORK_DIR} - --build=${CMAKE_CURRENT_BINARY_DIR} - --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app - --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched - DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py - ) - if (PACKAGE) - add_custom_target(package DEPENDS "${CMAKE_CFG_INTDIR}/.${product}.touched") + add_custom_target(package + COMMAND + ${PYTHON_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + --configuration=${CMAKE_CFG_INTDIR} + --channel=${VIEWER_CHANNEL} + --source=${CMAKE_CURRENT_SOURCE_DIR} + --artwork=${ARTWORK_DIR} + --build=${CMAKE_CURRENT_BINARY_DIR} + --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app + --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched + DEPENDS + secondlife-bin + ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + ) endif (PACKAGE) endif (DARWIN) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4b117cd180..a47e2ba5d6 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -402,7 +402,8 @@ class DarwinManifest(ViewerManifest): self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib") #libfmodwrapper.dylib - self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") + self.path('fmodwrapper/%s/libfmodwrapper.dylib' % + self.args['configuration'], 'libfmodwrapper.dylib') # command line arguments for connecting to the proper grid self.put_in_file(self.flags_list(), 'arguments.txt') |