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

VC10 fixes

Browse Source
This commit is contained in:
siana
2011-03-21 03:13:49 +01:00
parent 15c01ed310
commit 611b8f48d6
5 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/00-Common.cmake
View File

@@ -99,7 +99,7 @@ if (WINDOWS)
elseif (MSVC90) elseif (MSVC90)
set(MSVC_DIR 9.0) set(MSVC_DIR 9.0)
set(MSVC_SUFFIX 90) set(MSVC_SUFFIX 90)
elseif (MSVC100) elseif (MSVC10)
set(MSVC_DIR 10.0) set(MSVC_DIR 10.0)
set(MSVC_SUFFIX 100) set(MSVC_SUFFIX 100)
endif (MSVC71) endif (MSVC71)

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/cmake/JsonCpp.cmake
View File

@@ -18,5 +18,5 @@ else (STANDALONE)
elseif (LINUX) elseif (LINUX)
set(JSONCPP_LIBRARIES jsoncpp) set(JSONCPP_LIBRARIES jsoncpp)
endif (WINDOWS) endif (WINDOWS)
set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp) set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json)
endif (STANDALONE) endif (STANDALONE)

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

4
install.xml
View File

@@ -936,9 +936,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>windows</key> <key>windows</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>a3e926b2dee29bbddfeff907102ca2b7</string> <string>999b265a3af47eb13e9a380d042a1763</string>
<key>url</key> <key>url</key>
<uri>https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-windows-20110317.tar.bz2</uri> <uri>https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-windows-20110320.tar.bz2</uri>
</map> </map>
</map> </map>
</map> </map>