Make viewer compile on standalone linux x86_64
This involves making libllcommon shared, a change that was not finished for windows/Mac. More changes are needed to indra/newview/viewer_manifest.py for those two operating systems, as well as to indra/copy_win_scripts. I did not test this on linux 32bit, nor non-standalone on that OS, either. I did not check voice (which will very likely not work anyway on 64bit). And currently the webkit plugin doesn't work for me, but I'll fix that in a different commit.
This commit is contained in:
@@ -1467,6 +1467,7 @@ if (LINUX)
|
||||
COMMAND ${PYTHON_EXECUTABLE}
|
||||
ARGS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
|
||||
--standalone=${STANDALONE}
|
||||
--grid=${GRID}
|
||||
--channel=${VIEWER_CHANNEL}
|
||||
--login_channel=${VIEWER_LOGIN_CHANNEL}
|
||||
@@ -1591,17 +1592,17 @@ endif (LL_TESTS)
|
||||
# Don't do these for DARWIN or LINUX here -- they're taken care of by viewer_manifest.py
|
||||
if (WINDOWS)
|
||||
|
||||
#~ get_target_property(BUILT_LLCOMMON llcommon LOCATION)
|
||||
#~ add_custom_command(
|
||||
#~ TARGET ${VIEWER_BINARY_NAME} POST_BUILD
|
||||
#~ COMMAND ${CMAKE_COMMAND}
|
||||
#~ ARGS
|
||||
#~ -E
|
||||
#~ copy_if_different
|
||||
#~ ${BUILT_LLCOMMON}
|
||||
#~ ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
|
||||
#~ COMMENT "Copying llcommon.dll to the runtime folder."
|
||||
#~ )
|
||||
get_target_property(BUILT_LLCOMMON llcommon LOCATION)
|
||||
add_custom_command(
|
||||
TARGET ${VIEWER_BINARY_NAME} POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
ARGS
|
||||
-E
|
||||
copy_if_different
|
||||
${BUILT_LLCOMMON}
|
||||
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
|
||||
COMMENT "Copying llcommon.dll to the runtime folder."
|
||||
)
|
||||
|
||||
get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION)
|
||||
add_custom_command(
|
||||
|
||||
Reference in New Issue
Block a user