[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.21.0-71-g9d423c2
Robin Cornelius
robin.cornelius at gmail.com
Tue Sep 2 22:49:00 UTC 2008
The following commit has been merged in the master branch:
commit 1aee16aa1d1aac6050f0cd2436bd98a531ba4b76
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date: Tue Sep 2 21:44:19 2008 +0100
Build fixes and extra required patches
diff --git a/debian/patches/dont_depend_on_artwork_to_build.patch b/debian/patches/dont_depend_on_artwork_to_build.patch
new file mode 100644
index 0000000..68b8d40
--- /dev/null
+++ b/debian/patches/dont_depend_on_artwork_to_build.patch
@@ -0,0 +1,13 @@
+Index: slviewer/indra/newview/CMakeLists.txt
+===================================================================
+--- slviewer.orig/indra/newview/CMakeLists.txt 2008-09-02 21:39:36.000000000 +0100
++++ slviewer/indra/newview/CMakeLists.txt 2008-09-02 21:40:11.000000000 +0100
+@@ -1237,7 +1237,7 @@
+ set_source_files_properties(${viewer_CHARACTER_FILES}
+ PROPERTIES HEADER_FILE_ONLY TRUE)
+
+-list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
++#list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
+
+
+ if (OPENAL)
diff --git a/debian/patches/rename_binary_cmake.patch b/debian/patches/rename_binary_cmake.patch
new file mode 100644
index 0000000..7069cc0
--- /dev/null
+++ b/debian/patches/rename_binary_cmake.patch
@@ -0,0 +1,158 @@
+--- ./indra/newview/CMakeLists.txt 2008-08-21 01:01:19.000000000 +0100
++++ ./indra/newview/CMakeLists.txt 2008-08-30 15:26:11.000000000 +0100
+@@ -430,6 +430,8 @@
+ pipeline.cpp
+ )
+
++set(BINARY_NAME CACHE STRING "secondlife-bin")
++
+ if (LINUX)
+ # We can't set these flags for Darwin, because they get passed to
+ # the PPC compiler. Ugh.
+@@ -1264,15 +1266,15 @@
+ set_source_files_properties(${viewer_HEADER_FILES}
+ PROPERTIES HEADER_FILE_ONLY TRUE)
+
+-add_executable(secondlife-bin
++add_executable(${BINARY_NAME}
+ WIN32
+ MACOSX_BUNDLE
+ ${viewer_SOURCE_FILES}
+ )
+-check_message_template(secondlife-bin)
++check_message_template(${BINARY_NAME})
+
+ if (LLKDU_LIBRARY)
+- add_dependencies(secondlife-bin ${LLKDU_LIBRARY})
++ add_dependencies(${BINARY_NAME} ${LLKDU_LIBRARY})
+ endif (LLKDU_LIBRARY)
+
+ set(PACKAGE OFF CACHE BOOL
+@@ -1280,12 +1282,12 @@
+
+ if (WINDOWS)
+ if(MSVC71)
+- set(release_flags "/MAP:Release/secondlife-bin.map /MAPINFO:LINES")
++ set(release_flags "/MAP:Release/${BINARY_NAME}.map /MAPINFO:LINES")
+ else(MSVC71)
+- set(release_flags "/MAP:Release/secondlife-bin.map")
++ set(release_flags "/MAP:Release/${BINARY_NAME}.map")
+ endif(MSVC71)
+
+- set_target_properties(secondlife-bin
++ set_target_properties(${BINARY_NAME}
+ PROPERTIES
+ LINK_FLAGS "/debug /NODEFAULTLIB:MSVCRT /SUBSYSTEM:WINDOWS"
+ LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:MSVCRTD"
+@@ -1295,20 +1297,20 @@
+ # sets the 'working directory' for debugging from visual studio.
+ if (NOT UNATTENDED)
+ add_custom_command(
+- TARGET secondlife-bin PRE_BUILD
++ TARGET ${BINARY_NAME} PRE_BUILD
+ COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
+ ARGS
+ --solution
+ ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
+ --workingdir
+- secondlife-bin
++ ${BINARY_NAME}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+- COMMENT "Setting the secondlife-bin working directory for debugging."
++ COMMENT "Setting the ${BINARY_NAME} working directory for debugging."
+ )
+ endif (NOT UNATTENDED)
+
+ add_custom_command(
+- TARGET secondlife-bin PRE_BUILD
++ TARGET ${BINARY_NAME} PRE_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS
+ -E
+@@ -1319,7 +1321,7 @@
+ )
+
+ add_custom_command(
+- TARGET secondlife-bin PRE_BUILD
++ TARGET ${BINARY_NAME} PRE_BUILD
+ COMMAND ${CMAKE_COMMAND}
+ ARGS
+ -E
+@@ -1329,10 +1331,10 @@
+ COMMENT "Copying message.xml to the runtime folder."
+ )
+
+- add_dependencies(secondlife-bin copy_win_libs)
++ add_dependencies(${BINARY_NAME} copy_win_libs)
+
+ if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
+- add_dependencies(secondlife-bin copy_win_scripts)
++ add_dependencies(${BINARY_NAME} copy_win_scripts)
+ endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
+
+ add_custom_command(
+@@ -1349,7 +1351,7 @@
+ --build=${CMAKE_CURRENT_BINARY_DIR}
+ --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
+ --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
+- DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
++ DEPENDS ${BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+ )
+ if (PACKAGE)
+ add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
+@@ -1357,7 +1359,7 @@
+ endif (PACKAGE)
+ endif (WINDOWS)
+
+-target_link_libraries(secondlife-bin
++target_link_libraries(${BINARY_NAME}
+ ${LLAUDIO_LIBRARIES}
+ ${LLCHARACTER_LIBRARIES}
+ ${LLIMAGE_LIBRARIES}
+@@ -1404,8 +1406,8 @@
+ add_custom_command(
+ OUTPUT secondlife-stripped
+ COMMAND strip
+- ARGS --strip-debug -o secondlife-stripped secondlife-bin
+- DEPENDS secondlife-bin
++ ARGS --strip-debug -o secondlife-stripped ${BINARY_NAME}
++ DEPENDS ${BINARY_NAME}
+ )
+
+ set(product SecondLife-${ARCH}-${viewer_VERSION})
+@@ -1437,7 +1439,7 @@
+ if (DARWIN)
+ set(product "Second Life")
+ set_target_properties(
+- secondlife-bin
++ ${BINARY_NAME}
+ PROPERTIES
+ OUTPUT_NAME "${product}"
+ MACOSX_BUNDLE_INFO_STRING "info string - localize me"
+@@ -1451,7 +1453,7 @@
+ )
+
+ add_custom_command(
+- TARGET secondlife-bin POST_BUILD
++ TARGET ${BINARY_NAME} POST_BUILD
+ COMMAND ${PYTHON_EXECUTABLE}
+ ARGS
+ ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+@@ -1462,7 +1464,7 @@
+ --artwork=${ARTWORK_DIR}
+ --build=${CMAKE_CURRENT_BINARY_DIR}
+ --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
+- DEPENDS secondlife-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
++ DEPENDS ${BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+ )
+
+ if (PACKAGE)
+@@ -1480,7 +1482,7 @@
+ --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
+ --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
+ DEPENDS
+- secondlife-bin
++ ${BINARY_NAME}
+ ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+ )
+ add_dependencies(package mac-updater mac-crash-logger)
--
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids
More information about the Pkg-games-commits
mailing list