From 17c59f25f584e14b44011eb6f0dd559c05a9dc79 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Sun, 20 Oct 2013 17:03:48 +0200 Subject: [PATCH] WIP[win64]: it builds, runs. webkit disabled in cmake for now --- indra/cmake/00-Common.cmake | 4 + indra/cmake/CopyWinLibs.cmake | 34 +++- indra/cmake/FMODEX.cmake | 30 ++-- indra/llplugin/CMakeLists.txt | 2 +- indra/newview/CMakeLists.txt | 29 +-- indra/newview/llfloaterpathfindingobjects.cpp | 4 +- indra/plugins/CMakeLists.txt | 7 +- indra/plugins/base_basic/CMakeLists.txt | 2 +- indra/plugins/base_media/CMakeLists.txt | 2 +- indra/plugins/example_basic/CMakeLists.txt | 2 +- indra/plugins/example_media/CMakeLists.txt | 2 +- indra/plugins/filepicker/CMakeLists.txt | 2 +- indra/plugins/webkit/CMakeLists.txt | 2 +- install.xml | 168 ++++++++++++++++++ 14 files changed, 253 insertions(+), 37 deletions(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2229b60ea..f6a9c0772 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -46,6 +46,10 @@ if (WINDOWS) set(MSVC_DIR 10.0) set(MSVC_SUFFIX 100) endif (MSVC10) + if (MSVC11) + set(MSVC_DIR 11.0) + set(MSVC_SUFFIX 110) + endif (MSVC11) # Remove default /Zm1000 flag that cmake inserts string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/indra/cmake/CopyWinLibs.cmake b/indra/cmake/CopyWinLibs.cmake index 9d52499a1..5081e4ac5 100644 --- a/indra/cmake/CopyWinLibs.cmake +++ b/indra/cmake/CopyWinLibs.cmake @@ -6,6 +6,14 @@ include(CMakeCopyIfDifferent) +#if (WORD_SIZE EQUAL 32) +# set(debug_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") +# set(release_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") +#else (WORD_SIZE EQUAL 32) + set(debug_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/x86_64-win/lib/debug") + set(release_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/x86_64-win/lib/release") +#endif WORD_SIZE EQUAL 32) + set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32") set(vivox_files SLVoice.exe @@ -23,7 +31,7 @@ copy_if_different( set(all_targets ${all_targets} ${out_targets}) -set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") +set(debug_src_dir "${debug_libs_dir}") set(debug_files libhunspell.dll libapr-1.dll @@ -43,6 +51,9 @@ 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_files @@ -203,9 +214,12 @@ copy_if_different( ) set(all_targets ${all_targets} ${out_targets}) -set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") +endif (WORD_SIZE EQUAL 32) +# /Singu TODO::WIN64 + +set(release_src_dir "${release_libs_dir}") set(release_files - libtcmalloc_minimal.dll +# libtcmalloc_minimal.dll libhunspell.dll libapr-1.dll libaprutil-1.dll @@ -217,7 +231,13 @@ set(release_files ) if(FMODEX) - find_path(FMODEX_BINARY_DIR fmodex.dll + if (WORD_SIZE EQUAL 32) + set(fmodex_dll_file "fmodex.dll") + else (WORD_SIZE EQUAL 32) + set(fmodex_dll_file "fmodex64.dll") + endif (WORD_SIZE EQUAL 32) + + find_path(FMODEX_BINARY_DIR "${fmodex_dll_file}" "${release_src_dir}" "${FMODEX_SDK_DIR}/api" "${FMODEX_SDK_DIR}" @@ -225,11 +245,11 @@ if(FMODEX) ) if(FMODEX_BINARY_DIR) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmodex.dll) + copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets "${fmodex_dll_file}") set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmodex.dll) + copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets "${fmodex_dll_file}") set(all_targets ${all_targets} ${out_targets}) - copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmodex.dll) + copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets "${fmodex_dll_file}") set(all_targets ${all_targets} ${out_targets}) endif(FMODEX_BINARY_DIR) endif(FMODEX) diff --git a/indra/cmake/FMODEX.cmake b/indra/cmake/FMODEX.cmake index dbac0ebac..6f84dbebd 100644 --- a/indra/cmake/FMODEX.cmake +++ b/indra/cmake/FMODEX.cmake @@ -16,7 +16,7 @@ if (NOT FMODEX_LIBRARY) ) elseif(WORD_SIZE EQUAL 64) find_library(FMODEX_LIBRARY - fmodex64 fmodexL64 + fmodex64_vc fmodexL64_vc fmodex64 fmodexL64 PATHS "${FMODEX_SDK_DIR}/api/lib" "${FMODEX_SDK_DIR}/api" @@ -25,21 +25,31 @@ if (NOT FMODEX_LIBRARY) ) endif(WORD_SIZE EQUAL 32) endif(FMODEX_SDK_DIR) - if(WINDOWS AND NOT FMODEX_LIBRARY) + if(WINDOWS AND NOT FMODEX_SDK_DIR) set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows") - find_library(FMODEX_LIBRARY - fmodex_vc fmodexL_vc - PATHS - "${FMODEX_PROG_DIR}/api/lib" - "${FMODEX_PROG_DIR}/api" - "${FMODEX_PROG_DIR}" - ) + if(WORD_SIZE EQUAL 32) + find_library(FMODEX_LIBRARY + fmodex_vc fmodexL_vc + PATHS + "${FMODEX_PROG_DIR}/api/lib" + "${FMODEX_PROG_DIR}/api" + "${FMODEX_PROG_DIR}" + ) + else(WORD_SIZE EQUAL 32) + find_library(FMODEX_LIBRARY + fmodex64_vc fmodexL64_vc + PATHS + "${FMODEX_PROG_DIR}/api/lib" + "${FMODEX_PROG_DIR}/api" + "${FMODEX_PROG_DIR}" + ) + endif(WORD_SIZE EQUAL 32) if(FMODEX_LIBRARY) message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}") set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}") set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}" CACHE PATH "Path to the FMOD Ex SDK." FORCE) endif(FMODEX_LIBRARY) - endif(WINDOWS AND NOT FMODEX_LIBRARY) + endif(WINDOWS AND NOT FMODEX_SDK_DIR) endif (NOT FMODEX_LIBRARY) find_path(FMODEX_INCLUDE_DIR fmod.hpp diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt index 446028b0f..5aa33696e 100644 --- a/indra/llplugin/CMakeLists.txt +++ b/indra/llplugin/CMakeLists.txt @@ -49,7 +49,7 @@ set_source_files_properties(${llplugin_HEADER_FILES} if(NOT WORD_SIZE EQUAL 32) if(WINDOWS) - add_definitions(/FIXED:NO) + # add_definitions(/FIXED:NO) else(WINDOWS) # not windows therefore gcc LINUX and DARWIN add_definitions(-fPIC) endif(WINDOWS) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index d7dbce179..98c48c22c 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1437,11 +1437,7 @@ set(PACKAGE ${PACKAGE_DEFAULT} CACHE BOOL "Add a package target that builds an installer package.") if (WINDOWS) - if(MSVC10) - set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map") - else(MSVC10) - set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map") - endif(MSVC10) + set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map") if (FMOD) if(MANIFEST_LIBRARIES) @@ -1451,12 +1447,18 @@ if (WINDOWS) endif(MANIFEST_LIBRARIES) endif (FMOD) if (FMODEX) + if (WORD_SIZE EQUAL 32) + set(fmodex_dll_file "fmodex.dll") + else (WORD_SIZE EQUAL 32) + set(fmodex_dll_file "fmodex64.dll") + endif (WORD_SIZE EQUAL 32) + if(MANIFEST_LIBRARIES) - set(MANIFEST_LIBRARIES "${MANIFEST_LIBRARIES}|${FMODEX_BINARY_DIR}/fmodex.dll") + set(MANIFEST_LIBRARIES "${MANIFEST_LIBRARIES}|${FMODEX_BINARY_DIR}/${fmodex_dll_file}") else(MANIFEST_LIBRARIES) - set(MANIFEST_LIBRARIES "--extra_libraries=${FMODEX_BINARY_DIR}/fmodex.dll") + set(MANIFEST_LIBRARIES "--extra_libraries=${FMODEX_BINARY_DIR}/${fmodex_dll_file}") endif(MANIFEST_LIBRARIES) - set(EXTRA_LINKER_FLAGS "/DELAYLOAD:fmodex.dll") + set(EXTRA_LINKER_FLAGS "/DELAYLOAD:${fmodex_dll_file}") endif (FMODEX) set_target_properties(${VIEWER_BINARY_NAME} @@ -1886,6 +1888,8 @@ 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 @@ -1897,6 +1901,7 @@ 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( @@ -1910,7 +1915,7 @@ if (WINDOWS) COMMENT "Copying Quicktime Plugin to the runtime folder." ) - get_target_property(BUILT_FILEPICKER_PLUGIN basic_plugin_filepicker LOCATION) + get_target_property(BUILT_FILEPICKER_PLUGIN basic_plugin_filepicker LOCATION) add_custom_command( TARGET ${VIEWER_BINARY_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} @@ -1922,7 +1927,9 @@ if (WINDOWS) COMMENT "Copying filepicker Plugin to the runtime folder." ) - get_target_property(BUILT_WINMM_SHIM_PLUGIN winmm_shim LOCATION) +# winmm doesn't build on windows 64 + if(WORD_SIZE EQUAL 32) + get_target_property(BUILT_WINMM_SHIM_PLUGIN winmm_shim LOCATION) add_custom_command( TARGET ${VIEWER_BINARY_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} @@ -1933,6 +1940,8 @@ if (WINDOWS) ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} COMMENT "Copying winmm.dll to the runtime folder." ) + endif(WORD_SIZE EQUAL 32) + # Copying the mime_types.xml file to app_settings set(mime_types_source "${CMAKE_SOURCE_DIR}/newview/skins/default/xui/en-us") set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings") diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp index 8a606a07b..b872b83a4 100644 --- a/indra/newview/llfloaterpathfindingobjects.cpp +++ b/indra/newview/llfloaterpathfindingobjects.cpp @@ -397,12 +397,14 @@ void LLFloaterPathfindingObjects::addObjectToScrollList(const LLPathfindingObjec } LLScrollListItem *scrollListItem = mObjectsScrollList->addElement(rowParams); - +// Singu TODO::WIN64 +#if !defined(_WIN64) if (pObjectPtr->hasOwner() && !pObjectPtr->hasOwnerName()) { mMissingNameObjectsScrollListItems.insert(std::make_pair(pObjectPtr->getUUID().asString(), scrollListItem)); pObjectPtr->registerOwnerNameListener(boost::bind(&LLFloaterPathfindingObjects::handleObjectNameResponse, this, _1)); } +#endif } void LLFloaterPathfindingObjects::updateControlsOnScrollListChange() diff --git a/indra/plugins/CMakeLists.txt b/indra/plugins/CMakeLists.txt index bab7d936b..36ba40f4d 100644 --- a/indra/plugins/CMakeLists.txt +++ b/indra/plugins/CMakeLists.txt @@ -3,7 +3,10 @@ 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) @@ -13,9 +16,9 @@ if (WINDOWS OR DARWIN) add_subdirectory(quicktime) endif (WINDOWS OR DARWIN) -if (WINDOWS) +if (WINDOWS AND WORD_SIZE EQUAL 32) add_subdirectory(winmmshim) -endif (WINDOWS) +endif (WINDOWS AND WORD_SIZE EQUAL 32) add_subdirectory(example_basic) add_subdirectory(example_media) diff --git a/indra/plugins/base_basic/CMakeLists.txt b/indra/plugins/base_basic/CMakeLists.txt index 05b84324f..4ec14131b 100644 --- a/indra/plugins/base_basic/CMakeLists.txt +++ b/indra/plugins/base_basic/CMakeLists.txt @@ -17,7 +17,7 @@ include_directories( if(NOT WORD_SIZE EQUAL 32) if(WINDOWS) - add_definitions(/FIXED:NO) + # add_definitions(/FIXED:NO) else(WINDOWS) # not windows therefore gcc LINUX and DARWIN add_definitions(-fPIC) endif(WINDOWS) diff --git a/indra/plugins/base_media/CMakeLists.txt b/indra/plugins/base_media/CMakeLists.txt index f7917a794..acd8d201c 100644 --- a/indra/plugins/base_media/CMakeLists.txt +++ b/indra/plugins/base_media/CMakeLists.txt @@ -31,7 +31,7 @@ include_directories( if(NOT WORD_SIZE EQUAL 32) if(WINDOWS) - add_definitions(/FIXED:NO) + # add_definitions(/FIXED:NO) else(WINDOWS) # not windows therefore gcc LINUX and DARWIN add_definitions(-fPIC) endif(WINDOWS) diff --git a/indra/plugins/example_basic/CMakeLists.txt b/indra/plugins/example_basic/CMakeLists.txt index 98f5d1657..e97cd3243 100644 --- a/indra/plugins/example_basic/CMakeLists.txt +++ b/indra/plugins/example_basic/CMakeLists.txt @@ -19,7 +19,7 @@ include_directories( if(NOT WORD_SIZE EQUAL 32) if(WINDOWS) - add_definitions(/FIXED:NO) + # add_definitions(/FIXED:NO) else(WINDOWS) # not windows therefore gcc LINUX and DARWIN add_definitions(-fPIC) endif(WINDOWS) diff --git a/indra/plugins/example_media/CMakeLists.txt b/indra/plugins/example_media/CMakeLists.txt index 0a8214eef..eefdd5251 100644 --- a/indra/plugins/example_media/CMakeLists.txt +++ b/indra/plugins/example_media/CMakeLists.txt @@ -30,7 +30,7 @@ include_directories( if(NOT WORD_SIZE EQUAL 32) if(WINDOWS) - add_definitions(/FIXED:NO) + # add_definitions(/FIXED:NO) else(WINDOWS) # not windows therefore gcc LINUX and DARWIN add_definitions(-fPIC) endif(WINDOWS) diff --git a/indra/plugins/filepicker/CMakeLists.txt b/indra/plugins/filepicker/CMakeLists.txt index 2070b664b..c973954dd 100644 --- a/indra/plugins/filepicker/CMakeLists.txt +++ b/indra/plugins/filepicker/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories( if(NOT WORD_SIZE EQUAL 32) if(WINDOWS) - add_definitions(/FIXED:NO) + # add_definitions(/FIXED:NO) else(WINDOWS) # not windows therefore gcc LINUX and DARWIN add_definitions(-fPIC) endif(WINDOWS) diff --git a/indra/plugins/webkit/CMakeLists.txt b/indra/plugins/webkit/CMakeLists.txt index 2046e8033..615333227 100644 --- a/indra/plugins/webkit/CMakeLists.txt +++ b/indra/plugins/webkit/CMakeLists.txt @@ -35,7 +35,7 @@ include_directories( if(NOT WORD_SIZE EQUAL 32) if(WINDOWS) - add_definitions(/FIXED:NO) + # add_definitions(/FIXED:NO) else(WINDOWS) # not windows therefore gcc LINUX and DARWIN add_definitions(-fPIC) endif(WINDOWS) diff --git a/install.xml b/install.xml index ad06f4df5..8e42bec70 100644 --- a/install.xml +++ b/install.xml @@ -64,6 +64,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/glod-1.0pre4-windows-20110610.tar.bz2 + windows64 + + md5sum + df67aeb1ca4681dc4d9a556454203426 + url + https://files.streamgrid.net/win64/singularity/glod-1.0pre4-windows64-20131020.tar.bz2 + SDL @@ -126,6 +133,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/apr_suite-1.4.2-windows-20110504.tar.bz2 + windows64 + + md5sum + 7dcae03cad9bc04ac7e937284e6d102e + url + https://files.streamgrid.net/win64/singularity/apr_suite-1.4.5-windows64-20131019.tar.bz2 + ares @@ -166,6 +180,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/ares-1.7.1-windows-20110504.tar.bz2 + windows64 + + md5sum + 2ca54250b59170f3e5342dacad529859 + url + https://files.streamgrid.net/win64/singularity/ares-1.9.1-windows64-20131019.tar.bz2 + boost @@ -206,6 +227,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/boost-1.52.0-windows-20130221.tar.bz2 + windows64 + + md5sum + 68c056e920ba2b25c0acded6f482a2e4 + url + https://files.streamgrid.net/win64/singularity/boost-1.53.0-windows64-20131019.tar.bz2 + colladadom @@ -246,6 +274,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-windows-20131006.tar.bz2 + windows64 + + md5sum + acbe863e1b3df636e1245cc27c280e7b + url + https://files.streamgrid.net/win64/singularity/colladadom-2.2-windows64-20131020.tar.bz2 + curl @@ -286,6 +321,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/curl-7.21.1-windows-20110504.tar.bz2 + windows64 + + md5sum + ffb31d596f41b650bed49ac13bb513de + url + https://files.streamgrid.net/win64/singularity/curl-7.24.0-windows64-20131019.tar.bz2 + db @@ -400,6 +442,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/expat-2.0.1-windows-20110215.tar.bz2 + windows64 + + md5sum + 3239d5c50d6f2c857cc1a95674dbd1f5 + url + https://files.streamgrid.net/win64/singularity/expat-2.1.0-windows64-20131019.tar.bz2 + fontconfig @@ -441,6 +490,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/freeglut-2.6.0-windows-20110214.tar.bz2 + windows64 + + md5sum + 74758efd7fc6246f704ea702c4b3e310 + url + https://bitbucket.org/SingularityViewer/libraries/downloads/freeglut-2.6.0-windows-20110214.tar.bz2 + freetype @@ -481,6 +537,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/freetype-2.4.4-windows-20110218.tar.bz2 + windows64 + + md5sum + bfde86bbd84536448ac2a717ed1646d8 + url + https://files.streamgrid.net/win64/singularity/freetype-2.5.0.1-windows64-20131020.tar.bz2 + glext @@ -514,6 +577,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/glext-82-win32-linux.tar.bz2 + windows64 + + md5sum + efc62daedd2f89b46ef0e466b3ef460c + url + https://files.streamgrid.net/win64/singularity/glext-82-win32-linux.tar.bz2 + glib @@ -560,6 +630,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/glui-2.36-windows-20110214.tar.bz2 + windows64 + + md5sum + eeec9982df843043a18748276bbf39ce + url + https://bitbucket.org/SingularityViewer/libraries/downloads/glui-2.36-windows-20110214.tar.bz2 + google_breakpad @@ -596,6 +673,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/google_breakpad-0.0.0-rev1099-windows-20131002.tar.bz2 + windows64 + + md5sum + b13ebfa3a82d5396709c57ad83999d83 + url + https://files.streamgrid.net/win64/singularity/google_breakpad-0.0.0-rev1099-windows64-20131019.tar.bz2 + gperftools @@ -710,6 +794,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/hunspell-windows-20120704.tar.bz2 + windows64 + + md5sum + d3ee81e7dfe338b46efc2830930e771e + url + https://files.streamgrid.net/win64/singularity/libhunspell-1.3.2-windows64-20131020.tar.bz2 + jpeglib @@ -750,6 +841,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/jpeglib-8c-windows-20120704.tar.bz2 + windows64 + + md5sum + ae1e481e0538365d3c69a7801dff9467 + url + https://files.streamgrid.net/win64/singularity/jpeglib-8c-windows64-20131020.tar.bz2 + jsoncpp @@ -790,6 +888,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/jsoncpp-0.5.0-windows-20120704.tar.bz2 + windows64 + + md5sum + 8cf95eef2a95b71eb4a8ab59779bed52 + url + https://files.streamgrid.net/win64/singularity/jsoncpp-0.5.0-windows64-20131020.tar.bz2 + libpng @@ -830,6 +935,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/libpng-1.5.2-windows-20120704.tar.bz2 + windows64 + + md5sum + 9d2b32caa8b91ccb5c46be6a53eb071b + url + https://files.streamgrid.net/win64/singularity/libpng-1.5.10-windows64-20131020.tar.bz2 + libuuid @@ -914,6 +1026,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-4.7.1-windows-20120228.tar.bz2 + windows64 + + md5sum + ccb96fa1260ef6c3060d407b8c6b3972 + url + https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-4.7.1-windows-20120228.tar.bz2 + mesa @@ -980,6 +1099,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/libndofdev-windows-20120704.tar.bz2 + windows64 + + md5sum + b59b4ddab26d4441829f50b48925baf0 + url + https://files.streamgrid.net/win64/singularity/libndofdev-0.1-windows64-20131020.tar.bz2 + ogg-vorbis @@ -1020,6 +1146,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/ogg_vorbis-1.2.2-1.3.2-windows-20110510.tar.bz2 + windows64 + + md5sum + a8ca0eef3d74936d504dab52ecc61ced + url + https://files.streamgrid.net/win64/singularity/ogg_vorbis-1.2.2-1.3.2-windows64-20131020.tar.bz2 + openSSL @@ -1056,6 +1189,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/openssl-1.0.0g-windows-20120207.tar.bz2 + windows64 + + md5sum + b50166f0b0a275c8ea0d3b11c578d792 + url + https://files.streamgrid.net/win64/singularity/openssl-1.0.0g-windows64-20131019.tar.bz2 + openal-soft @@ -1089,6 +1229,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/openal-1.12.854-1.1.0-windows-20110301.tar.bz2 + windows64 + + md5sum + e75f1529adcaa6e508d1725f59d93a16 + url + https://bitbucket.org/SingularityViewer/libraries/downloads/openal-1.12.854-1.1.0-windows-20110301.tar.bz2 + pcre @@ -1205,6 +1352,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-windows-20090309.tar.bz2 + windows64 + + md5sum + 752daa90e07c05202d1f76980cb955eb + url + https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-windows-20090309.tar.bz2 + xmlrpc-epi @@ -1245,6 +1399,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/xmlrpc_epi-0.54.1-windows-20120704.tar.bz2 + windows64 + + md5sum + 94c26b93b855f5816bb29f308d9997fb + url + https://files.streamgrid.net/win64/singularity/xmlrpc_epi-0.54.1-windows64-20131019.tar.bz2 + zlib @@ -1285,6 +1446,13 @@ url https://bitbucket.org/SingularityViewer/libraries/downloads/zlib-1.2.5-windows-20120704.tar.bz2 + windows64 + + md5sum + 5aa50bd41d6cf0262a94760ef66bdbcf + url + https://files.streamgrid.net/win64/singularity/zlib-1.2.8-windows64-20131019.tar.bz2 +