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

WIP[win64]: we haz 64 bit webkit

Browse Source
This commit is contained in:
Latif Khalifa
2013-10-21 20:42:31 +02:00
parent ea6adb7ae4
commit 73e1a9ad78
4 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/cmake/CopyWinLibs.cmake
View File

@@ -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

3
indra/newview/CMakeLists.txt
View File

@@ -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(

3
indra/plugins/CMakeLists.txt
View File

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