Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/siana/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2011-02-22 01:08:31 -06:00
parent ae07c82c05 146cb0ef97
commit 97d5e8f154
10 changed files with 2030 additions and 2032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/CMakeLists.txt
View File

@@ -97,8 +97,8 @@ if (VIEWER)
if (EXISTS ${VIEWER_DIR}win_setup) if (EXISTS ${VIEWER_DIR}win_setup)
add_subdirectory(${VIEWER_DIR}win_setup) add_subdirectory(${VIEWER_DIR}win_setup)
endif (EXISTS ${VIEWER_DIR}win_setup) endif (EXISTS ${VIEWER_DIR}win_setup)
#add_subdirectory(${VIEWER_PREFIX}win_updater) add_subdirectory(${VIEWER_PREFIX}win_updater)
#add_dependencies(viewer windows-updater) add_dependencies(viewer windows-updater)
add_dependencies(viewer windows-crash-logger) add_dependencies(viewer windows-crash-logger)
elseif (SOLARIS) elseif (SOLARIS)
add_subdirectory(solaris_crash_logger) add_subdirectory(solaris_crash_logger)

2
indra/cmake/CopyWinLibs.cmake
View File

@@ -241,6 +241,8 @@ set(all_targets ${all_targets} ${out_targets})
set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
set(release_files set(release_files
libtcmalloc_minimal.dll
fmod.dll
libapr-1.dll libapr-1.dll
libaprutil-1.dll libaprutil-1.dll
libapriconv-1.dll libapriconv-1.dll

7
indra/cmake/GooglePerfTools.cmake
View File

@@ -8,8 +8,8 @@ else (STANDALONE)
use_prebuilt_binary(google) use_prebuilt_binary(google)
endif (LINUX OR WINDOWS) endif (LINUX OR WINDOWS)
if (WINDOWS) if (WINDOWS)
set(TCMALLOC_LIBRARIES set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib)
libtcmalloc_minimal) set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"")
endif (WINDOWS) endif (WINDOWS)
if (LINUX) if (LINUX)
if(USE_GOOGLE_PERFTOOLS) if(USE_GOOGLE_PERFTOOLS)
@@ -42,8 +42,9 @@ else (USE_GOOGLE_PERFTOOLS)
endif (USE_GOOGLE_PERFTOOLS) endif (USE_GOOGLE_PERFTOOLS)
if (NOT(DISABLE_TCMALLOC OR USE_GOOGLE_PERFTOOLS)) if (NOT(DISABLE_TCMALLOC OR USE_GOOGLE_PERFTOOLS))
message(STATUS "Building with Google TCMalloc")
set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1_) set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1_)
include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR}) include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR})
set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES}) set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES})
set(GOOGLE_PERFTOOLS_LINKER_FLAGS ${TCMALLOC_LINKER_FLAGS})
endif() endif()

2
indra/llcommon/CMakeLists.txt
View File

@@ -207,6 +207,6 @@ target_link_libraries(
${APR_LIBRARIES} ${APR_LIBRARIES}
${EXPAT_LIBRARIES} ${EXPAT_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${WINDOWS_LIBRARIES} ${WINDOWS_LIBRARIES}
) )

2
indra/llcommon/llversionviewer.h
View File

@@ -36,7 +36,7 @@
const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 5; const S32 LL_VERSION_MINOR = 5;
const S32 LL_VERSION_PATCH = 4; const S32 LL_VERSION_PATCH = 4;
const S32 LL_VERSION_BUILD = 0; const S32 LL_VERSION_BUILD = 2;
const char * const LL_CHANNEL = "Singularity"; const char * const LL_CHANNEL = "Singularity";

8
indra/llplugin/slplugin/CMakeLists.txt
View File

@@ -54,6 +54,7 @@ set_target_properties(SLPlugin
) )
target_link_libraries(SLPlugin target_link_libraries(SLPlugin
${GOOGLE_PERFTOOLS_LIBRARIES}
${LLPLUGIN_LIBRARIES} ${LLPLUGIN_LIBRARIES}
${LLMESSAGE_LIBRARIES} ${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES} ${LLCOMMON_LIBRARIES}
@@ -83,4 +84,11 @@ if (LINUX)
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lrt") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lrt")
endif (LINUX) endif (LINUX)
if (WINDOWS)
set_target_properties(SLPlugin
PROPERTIES
LINK_FLAGS "${GOOGLE_PERFTOOLS_LINKER_FLAGS}"
)
endif (WINDOWS)
#ll_deploy_sharedlibs_command(SLPlugin) #ll_deploy_sharedlibs_command(SLPlugin)

4
indra/newview/CMakeLists.txt
View File

@@ -1323,7 +1323,7 @@ if (WINDOWS)
set_target_properties(${VIEWER_BINARY_NAME} set_target_properties(${VIEWER_BINARY_NAME}
PROPERTIES PROPERTIES
LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS" LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${GOOGLE_PERFTOOLS_LINKER_FLAGS}"
LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\"" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
LINK_FLAGS_RELEASE ${release_flags} LINK_FLAGS_RELEASE ${release_flags}
) )
@@ -1398,7 +1398,7 @@ if (WINDOWS)
endif (WINDOWS) endif (WINDOWS)
target_link_libraries(${VIEWER_BINARY_NAME} target_link_libraries(${VIEWER_BINARY_NAME}
${GOOGLE_PERFTOOLS_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES}
${LLAUDIO_LIBRARIES} ${LLAUDIO_LIBRARIES}
${LLCHARACTER_LIBRARIES} ${LLCHARACTER_LIBRARIES}
${LLIMAGE_LIBRARIES} ${LLIMAGE_LIBRARIES}

2
indra/newview/res/viewerRes.rc
View File

@@ -154,7 +154,7 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Siana Gears" VALUE "CompanyName", "Siana Gearz"
VALUE "FileDescription", "Singularity Viewer" VALUE "FileDescription", "Singularity Viewer"
VALUE "FileVersion", "1.5.0.0" VALUE "FileVersion", "1.5.0.0"
VALUE "InternalName", "Second Life" VALUE "InternalName", "Second Life"

2
indra/newview/res/viewerRes_bc.rc
View File

@@ -154,7 +154,7 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Siana Gears" VALUE "CompanyName", "Siana Gearz"
VALUE "FileDescription", "Singularity Viewer" VALUE "FileDescription", "Singularity Viewer"
VALUE "FileVersion", "1.5.0.0" VALUE "FileVersion", "1.5.0.0"
VALUE "InternalName", "Second Life" VALUE "InternalName", "Second Life"

55
indra/newview/viewer_manifest.py
View File

@@ -178,7 +178,7 @@ class WindowsManifest(ViewerManifest):
super(WindowsManifest, self).construct() super(WindowsManifest, self).construct()
# the final exe is complicated because we're not sure where it's coming from, # the final exe is complicated because we're not sure where it's coming from,
# nor do we have a fixed name for the executable # nor do we have a fixed name for the executable
self.path(self.find_existing_file('debug/secondlife-bin.exe', 'releaseSSE2/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe()) self.path(src='%s/secondlife-bin.exe' % self.args['configuration'], dst=self.final_exe())
# Plugin host application # Plugin host application
self.path(os.path.join(os.pardir, self.path(os.path.join(os.pardir,
@@ -186,14 +186,14 @@ class WindowsManifest(ViewerManifest):
"SLPlugin.exe") "SLPlugin.exe")
# need to get the kdu dll from any of the build directories as well # need to get the kdu dll from any of the build directories as well
try: #~ try:
self.path(self.find_existing_file('../llkdu/%s/llkdu.dll' % self.args['configuration'], #~ self.path(self.find_existing_file('../llkdu/%s/llkdu.dll' % self.args['configuration'],
'../../libraries/i686-win32/lib/release/llkdu.dll'), #~ '../../libraries/i686-win32/lib/release/llkdu.dll'),
dst='llkdu.dll') #~ dst='llkdu.dll')
pass #~ pass
except: #~ except:
print "Skipping llkdu.dll" #~ print "Skipping llkdu.dll"
pass #~ pass
self.path(src="licenses-win32.txt", dst="licenses.txt") self.path(src="licenses-win32.txt", dst="licenses.txt")
self.path("featuretable.txt") self.path("featuretable.txt")
@@ -269,7 +269,7 @@ class WindowsManifest(ViewerManifest):
#~ self.end_prefix() #~ self.end_prefix()
# For google-perftools tcmalloc allocator. # For google-perftools tcmalloc allocator.
self.path(src="../../libraries/i686-win32/lib/release/libtcmalloc_minimal.dll") self.path("../../libraries/i686-win32/lib/release/libtcmalloc_minimal.dll", dst="libtcmalloc_minimal.dll")
# These need to be installed as a SxS assembly, currently a 'private' assembly. # These need to be installed as a SxS assembly, currently a 'private' assembly.
# See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
@@ -297,18 +297,8 @@ class WindowsManifest(ViewerManifest):
self.end_prefix() self.end_prefix()
# pull in the crash logger and updater from other projects # pull in the crash logger and updater from other projects
self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'], dst="win_crash_logger.exe")
"../win_crash_logger/debug/windows-crash-logger.exe", self.path(src='../win_updater/%s/windows-updater.exe' % self.args['configuration'], dst="updater.exe")
"../win_crash_logger/release/windows-crash-logger.exe",
"../win_crash_logger/releaseSSE2/windows-crash-logger.exe",
"../win_crash_logger/relwithdebinfo/windows-crash-logger.exe"),
dst="win_crash_logger.exe")
self.path(src=self.find_existing_file(
"../win_updater/debug/windows-updater.exe",
"../win_updater/release/windows-updater.exe",
"../win_updater/releaseSSE2/windows-updater.exe",
"../win_updater/relwithdebinfo/windows-updater.exe"),
dst="updater.exe")
def nsi_file_commands(self, install=True): def nsi_file_commands(self, install=True):
@@ -527,9 +517,6 @@ class DarwinManifest(ViewerManifest):
self.end_prefix("llplugin") self.end_prefix("llplugin")
# skins
self.path("skins")
# Per platform MIME config on the cheap. See SNOW-307 / DEV-41388 # Per platform MIME config on the cheap. See SNOW-307 / DEV-41388
self.path("skins/default/xui/en-us/mime_types_mac.xml", "skins/default/xui/en-us/mime_types.xml") self.path("skins/default/xui/en-us/mime_types_mac.xml", "skins/default/xui/en-us/mime_types.xml")
@@ -754,15 +741,15 @@ class Linux_i686Manifest(LinuxManifest):
# install either the libllkdu we just built, or a prebuilt one, in # install either the libllkdu we just built, or a prebuilt one, in
# decreasing order of preference. for linux package, this goes to bin/ # decreasing order of preference. for linux package, this goes to bin/
try: #~ try:
self.path(self.find_existing_file('../llkdu/libllkdu.so', #~ self.path(self.find_existing_file('../llkdu/libllkdu.so',
'../../libraries/i686-linux/lib_release_client/libllkdu.so'), #~ '../../libraries/i686-linux/lib_release_client/libllkdu.so'),
dst='bin/libllkdu.so') #~ dst='bin/libllkdu.so')
# keep this one to preserve syntax, open source mangling removes previous lines #~ # keep this one to preserve syntax, open source mangling removes previous lines
pass #~ pass
except: #~ except:
print "Skipping libllkdu.so - not found" #~ print "Skipping libllkdu.so - not found"
pass #~ pass
if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"): if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):