From 73e1a9ad78f5d283fcd90f0dbb31ec3d22bfb6b9 Mon Sep 17 00:00:00 2001
From: Latif Khalifa <latifer@streamgrid.net>
Date: Mon, 21 Oct 2013 20:42:31 +0200
Subject: [PATCH] WIP[win64]: we haz 64 bit webkit

---
 indra/cmake/CopyWinLibs.cmake | 17 ++++++-----------
 indra/newview/CMakeLists.txt  |  3 ---
 indra/plugins/CMakeLists.txt  |  3 ---
 install.xml                   |  4 ++--
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/indra/cmake/CopyWinLibs.cmake b/indra/cmake/CopyWinLibs.cmake
index 5081e4ac5..f588e7203 100644
--- a/indra/cmake/CopyWinLibs.cmake
+++ b/indra/cmake/CopyWinLibs.cmake
@@ -51,11 +51,8 @@ copy_if_different(
     )
 set(all_targets ${all_targets} ${out_targets})
 
-# Singu TODO::WIN64
-if (WORD_SIZE EQUAL 32)
-
 # 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 "${debug_libs_dir}")
 set(plugintest_debug_files
     libeay32.dll
     qtcored4.dll
@@ -74,7 +71,7 @@ copy_if_different(
 set(all_targets ${all_targets} ${out_targets})
 
 # Debug config runtime files required for the plugin test mule (Qt image format plugins)
-set(plugintest_debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/imageformats")
+set(plugintest_debug_src_dir "${debug_libs_dir}/imageformats")
 set(plugintest_debug_files
     qgifd4.dll
     qicod4.dll
@@ -100,7 +97,7 @@ copy_if_different(
 set(all_targets ${all_targets} ${out_targets})
 
 # 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 "${release_libs_dir}")
 set(plugintest_release_files
     libeay32.dll
     qtcore4.dll
@@ -127,7 +124,7 @@ copy_if_different(
 set(all_targets ${all_targets} ${out_targets})
 
 # Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
-set(plugintest_release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/imageformats")
+set(plugintest_release_src_dir "${release_libs_dir}/imageformats")
 set(plugintest_release_files
     qgif4.dll
     qico4.dll
@@ -169,7 +166,7 @@ copy_if_different(
 set(all_targets ${all_targets} ${out_targets})
 
 # 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 "${debug_libs_dir}")
 set(plugins_debug_files
     libeay32.dll
     qtcored4.dll
@@ -188,7 +185,7 @@ copy_if_different(
 set(all_targets ${all_targets} ${out_targets})
 
 # 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 "${release_libs_dir}")
 set(plugins_release_files
     libeay32.dll
     qtcore4.dll
@@ -214,8 +211,6 @@ copy_if_different(
     )
 set(all_targets ${all_targets} ${out_targets})
 
-endif (WORD_SIZE EQUAL 32)
-# /Singu TODO::WIN64
 
 set(release_src_dir "${release_libs_dir}")
 set(release_files
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 98c48c22c..7ae9a2cf6 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1888,8 +1888,6 @@ if (WINDOWS)
       COMMENT "Copying SLPlugin executable to the runtime folder."
       )
 
-# Singu TODO::WIN64
-  if(WORD_SIZE EQUAL 32)
   get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
     add_custom_command(
         TARGET ${VIEWER_BINARY_NAME} POST_BUILD
@@ -1901,7 +1899,6 @@ if (WINDOWS)
           ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
         COMMENT "Copying WebKit Plugin to the runtime folder."
         )
-  endif(WORD_SIZE EQUAL 32)
 
   get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
     add_custom_command(
diff --git a/indra/plugins/CMakeLists.txt b/indra/plugins/CMakeLists.txt
index 36ba40f4d..259ed1bde 100644
--- a/indra/plugins/CMakeLists.txt
+++ b/indra/plugins/CMakeLists.txt
@@ -3,10 +3,7 @@
 add_subdirectory(base_basic)
 add_subdirectory(base_media)
 add_subdirectory(filepicker)
-# Singu TODO::WIN64
-if (NOT WINDOWS OR WORD_SIZE EQUAL 32)
 add_subdirectory(webkit)
-endif (NOT WINDOWS OR WORD_SIZE EQUAL 32)
 
 if (LINUX)
     add_subdirectory(gstreamer010)
diff --git a/install.xml b/install.xml
index b2aa1c991..c9f3a4261 100644
--- a/install.xml
+++ b/install.xml
@@ -1029,9 +1029,9 @@
           <key>windows64</key>
           <map>
             <key>md5sum</key>
-            <string>ccb96fa1260ef6c3060d407b8c6b3972</string>
+            <string>cf9e5d1d79531a7e4d45f78657da9c9b</string>
             <key>url</key>
-            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-4.7.1-windows-20120228.tar.bz2</uri>
+            <uri>https://files.streamgrid.net/win64/singularity/llqtwebkit-4.7.1-windows64-20131021.tar.bz2</uri>
           </map>
         </map>
       </map>