livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Mac viewer build happier

master
Bryan O'Sullivan 2008-06-10 23:14:04 +00:00
parent 78f7c3f4ef
commit c9ce59223c
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
indra/newview/CMakeLists.txt
View File

@ -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)

3
indra/newview/viewer_manifest.py
View File

@ -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')