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

More build/package fixes

Browse Source
This commit is contained in:
siana
2011-03-19 00:08:02 +01:00
parent 3b567d3eae
commit 472dade93a
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/cmake/CopyWinLibs.cmake
View File

@@ -41,7 +41,7 @@ set(all_targets ${all_targets} ${out_targets})
# Debug config runtime files required for the plugin test mule # Debug config runtime files required for the plugin test mule
set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
set(plugintest_debug_files set(plugintest_debug_files
libeay32.dll #libeay32.dll
libglib-2.0-0.dll libglib-2.0-0.dll
libgmodule-2.0-0.dll libgmodule-2.0-0.dll
libgobject-2.0-0.dll libgobject-2.0-0.dll
@@ -51,7 +51,7 @@ set(plugintest_debug_files
qtnetworkd4.dll qtnetworkd4.dll
qtopengld4.dll qtopengld4.dll
qtwebkitd4.dll qtwebkitd4.dll
ssleay32.dll #ssleay32.dll
) )
copy_if_different( copy_if_different(
${plugintest_debug_src_dir} ${plugintest_debug_src_dir}
@@ -90,7 +90,7 @@ set(all_targets ${all_targets} ${out_targets})
# Release & ReleaseDebInfo config runtime files required for the plugin test mule # Release & ReleaseDebInfo config runtime files required for the plugin test mule
set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
set(plugintest_release_files set(plugintest_release_files
libeay32.dll #libeay32.dll
libglib-2.0-0.dll libglib-2.0-0.dll
libgmodule-2.0-0.dll libgmodule-2.0-0.dll
libgobject-2.0-0.dll libgobject-2.0-0.dll
@@ -101,7 +101,7 @@ set(plugintest_release_files
qtnetwork4.dll qtnetwork4.dll
qtopengl4.dll qtopengl4.dll
qtwebkit4.dll qtwebkit4.dll
ssleay32.dll #ssleay32.dll
) )
copy_if_different( copy_if_different(
${plugintest_release_src_dir} ${plugintest_release_src_dir}
@@ -188,13 +188,13 @@ set(all_targets ${all_targets} ${out_targets})
# Debug config runtime files required for the plugins # Debug config runtime files required for the plugins
set(plugins_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") set(plugins_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
set(plugins_debug_files set(plugins_debug_files
libeay32.dll #libeay32.dll
qtcored4.dll qtcored4.dll
qtguid4.dll qtguid4.dll
qtnetworkd4.dll qtnetworkd4.dll
qtopengld4.dll qtopengld4.dll
qtwebkitd4.dll qtwebkitd4.dll
ssleay32.dll #ssleay32.dll
) )
copy_if_different( copy_if_different(
${plugins_debug_src_dir} ${plugins_debug_src_dir}
@@ -207,13 +207,13 @@ set(all_targets ${all_targets} ${out_targets})
# Release & ReleaseDebInfo config runtime files required for the plugins # Release & ReleaseDebInfo config runtime files required for the plugins
set(plugins_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") set(plugins_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
set(plugins_release_files set(plugins_release_files
libeay32.dll #libeay32.dll
qtcore4.dll qtcore4.dll
qtgui4.dll qtgui4.dll
qtnetwork4.dll qtnetwork4.dll
qtopengl4.dll qtopengl4.dll
qtwebkit4.dll qtwebkit4.dll
ssleay32.dll #ssleay32.dll
) )
copy_if_different( copy_if_different(
${plugins_release_src_dir} ${plugins_release_src_dir}

2
indra/llui/llresmgr.cpp
View File

@@ -460,7 +460,7 @@ LLLocale::LLLocale(const std::string& locale_string)
char* new_locale_string = setlocale( LC_ALL, locale_string.c_str()); char* new_locale_string = setlocale( LC_ALL, locale_string.c_str());
if ( new_locale_string == NULL) if ( new_locale_string == NULL)
{ {
llwarns << "Failed to set locale " << locale_string << llendl; llwarns << "Failed to set locale " << locale_string.c_str() << llendl;
setlocale(LC_ALL, SYSTEM_LOCALE.c_str()); setlocale(LC_ALL, SYSTEM_LOCALE.c_str());
} }
//else //else

9
indra/newview/viewer_manifest.py
View File

@@ -223,14 +223,14 @@ class WindowsManifest(ViewerManifest):
# For WebKit/Qt plugin runtimes # For WebKit/Qt plugin runtimes
if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"): if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
self.path("libeay32.dll") #self.path("libeay32.dll")
self.path("qtcore4.dll") self.path("qtcore4.dll")
self.path("qtgui4.dll") self.path("qtgui4.dll")
self.path("qtnetwork4.dll") self.path("qtnetwork4.dll")
self.path("qtopengl4.dll") self.path("qtopengl4.dll")
self.path("qtwebkit4.dll") self.path("qtwebkit4.dll")
self.path("qtxmlpatterns4.dll") self.path("qtxmlpatterns4.dll")
self.path("ssleay32.dll") #self.path("ssleay32.dll")
self.end_prefix() self.end_prefix()
# For WebKit/Qt plugin runtimes (image format plugins) # For WebKit/Qt plugin runtimes (image format plugins)
@@ -271,6 +271,11 @@ class WindowsManifest(ViewerManifest):
# For google-perftools tcmalloc allocator. # For google-perftools tcmalloc allocator.
self.path("../../libraries/i686-win32/lib/release/libtcmalloc_minimal.dll", dst="libtcmalloc_minimal.dll") self.path("../../libraries/i686-win32/lib/release/libtcmalloc_minimal.dll", dst="libtcmalloc_minimal.dll")
try:
if self.prefix("../../libraries/i686-win32/lib/release/msvcrt", dst=""):
self.path(*.dll)
self.end_prefix()
# 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
#~ if self.prefix(src=self.args['configuration'], dst=""): #~ if self.prefix(src=self.args['configuration'], dst=""):