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

WIP[win64]: it builds, runs. webkit disabled in cmake for now

Browse Source
This commit is contained in:
Latif Khalifa
2013-10-20 17:03:48 +02:00
parent 6bae4a8d92
commit 17c59f25f5
14 changed files with 253 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,10 @@ if (WINDOWS)
set(MSVC_DIR 10.0) set(MSVC_DIR 10.0)
set(MSVC_SUFFIX 100) set(MSVC_SUFFIX 100)
endif (MSVC10) endif (MSVC10)
if (MSVC11)
set(MSVC_DIR 11.0)
set(MSVC_SUFFIX 110)
endif (MSVC11)
# Remove default /Zm1000 flag that cmake inserts # Remove default /Zm1000 flag that cmake inserts
string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

34
indra/cmake/CopyWinLibs.cmake
View File

@@ -6,6 +6,14 @@
include(CMakeCopyIfDifferent) 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_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
set(vivox_files set(vivox_files
SLVoice.exe SLVoice.exe
@@ -23,7 +31,7 @@ copy_if_different(
set(all_targets ${all_targets} ${out_targets}) 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 set(debug_files
libhunspell.dll libhunspell.dll
libapr-1.dll libapr-1.dll
@@ -43,6 +51,9 @@ copy_if_different(
) )
set(all_targets ${all_targets} ${out_targets}) 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 # 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
@@ -203,9 +214,12 @@ copy_if_different(
) )
set(all_targets ${all_targets} ${out_targets}) 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 set(release_files
libtcmalloc_minimal.dll # libtcmalloc_minimal.dll
libhunspell.dll libhunspell.dll
libapr-1.dll libapr-1.dll
libaprutil-1.dll libaprutil-1.dll
@@ -217,7 +231,13 @@ set(release_files
) )
if(FMODEX) 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}" "${release_src_dir}"
"${FMODEX_SDK_DIR}/api" "${FMODEX_SDK_DIR}/api"
"${FMODEX_SDK_DIR}" "${FMODEX_SDK_DIR}"
@@ -225,11 +245,11 @@ if(FMODEX)
) )
if(FMODEX_BINARY_DIR) 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}) 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}) 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}) set(all_targets ${all_targets} ${out_targets})
endif(FMODEX_BINARY_DIR) endif(FMODEX_BINARY_DIR)
endif(FMODEX) endif(FMODEX)

30
indra/cmake/FMODEX.cmake
View File

@@ -16,7 +16,7 @@ if (NOT FMODEX_LIBRARY)
) )
elseif(WORD_SIZE EQUAL 64) elseif(WORD_SIZE EQUAL 64)
find_library(FMODEX_LIBRARY find_library(FMODEX_LIBRARY
fmodex64 fmodexL64 fmodex64_vc fmodexL64_vc fmodex64 fmodexL64
PATHS PATHS
"${FMODEX_SDK_DIR}/api/lib" "${FMODEX_SDK_DIR}/api/lib"
"${FMODEX_SDK_DIR}/api" "${FMODEX_SDK_DIR}/api"
@@ -25,21 +25,31 @@ if (NOT FMODEX_LIBRARY)
) )
endif(WORD_SIZE EQUAL 32) endif(WORD_SIZE EQUAL 32)
endif(FMODEX_SDK_DIR) 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") set(FMODEX_PROG_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows")
find_library(FMODEX_LIBRARY if(WORD_SIZE EQUAL 32)
fmodex_vc fmodexL_vc find_library(FMODEX_LIBRARY
PATHS fmodex_vc fmodexL_vc
"${FMODEX_PROG_DIR}/api/lib" PATHS
"${FMODEX_PROG_DIR}/api" "${FMODEX_PROG_DIR}/api/lib"
"${FMODEX_PROG_DIR}" "${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) if(FMODEX_LIBRARY)
message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}") message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}")
set(FMODEX_SDK_DIR "${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) set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}" CACHE PATH "Path to the FMOD Ex SDK." FORCE)
endif(FMODEX_LIBRARY) endif(FMODEX_LIBRARY)
endif(WINDOWS AND NOT FMODEX_LIBRARY) endif(WINDOWS AND NOT FMODEX_SDK_DIR)
endif (NOT FMODEX_LIBRARY) endif (NOT FMODEX_LIBRARY)
find_path(FMODEX_INCLUDE_DIR fmod.hpp find_path(FMODEX_INCLUDE_DIR fmod.hpp

2
indra/llplugin/CMakeLists.txt
View File

@@ -49,7 +49,7 @@ set_source_files_properties(${llplugin_HEADER_FILES}
if(NOT WORD_SIZE EQUAL 32) if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS) if(WINDOWS)
add_definitions(/FIXED:NO) # add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC) add_definitions(-fPIC)
endif(WINDOWS) endif(WINDOWS)

29
indra/newview/CMakeLists.txt
View File

@@ -1437,11 +1437,7 @@ set(PACKAGE ${PACKAGE_DEFAULT} CACHE BOOL
"Add a package target that builds an installer package.") "Add a package target that builds an installer package.")
if (WINDOWS) if (WINDOWS)
if(MSVC10) set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map")
set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map")
else(MSVC10)
set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
endif(MSVC10)
if (FMOD) if (FMOD)
if(MANIFEST_LIBRARIES) if(MANIFEST_LIBRARIES)
@@ -1451,12 +1447,18 @@ if (WINDOWS)
endif(MANIFEST_LIBRARIES) endif(MANIFEST_LIBRARIES)
endif (FMOD) endif (FMOD)
if (FMODEX) 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) 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) 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) endif(MANIFEST_LIBRARIES)
set(EXTRA_LINKER_FLAGS "/DELAYLOAD:fmodex.dll") set(EXTRA_LINKER_FLAGS "/DELAYLOAD:${fmodex_dll_file}")
endif (FMODEX) endif (FMODEX)
set_target_properties(${VIEWER_BINARY_NAME} set_target_properties(${VIEWER_BINARY_NAME}
@@ -1886,6 +1888,8 @@ if (WINDOWS)
COMMENT "Copying SLPlugin executable to the runtime folder." 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) get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
add_custom_command( add_custom_command(
TARGET ${VIEWER_BINARY_NAME} POST_BUILD TARGET ${VIEWER_BINARY_NAME} POST_BUILD
@@ -1897,6 +1901,7 @@ if (WINDOWS)
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
COMMENT "Copying WebKit Plugin to the runtime folder." COMMENT "Copying WebKit Plugin to the runtime folder."
) )
endif(WORD_SIZE EQUAL 32)
get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION) get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
add_custom_command( add_custom_command(
@@ -1910,7 +1915,7 @@ if (WINDOWS)
COMMENT "Copying Quicktime Plugin to the runtime folder." 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( add_custom_command(
TARGET ${VIEWER_BINARY_NAME} POST_BUILD TARGET ${VIEWER_BINARY_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
@@ -1922,7 +1927,9 @@ if (WINDOWS)
COMMENT "Copying filepicker Plugin to the runtime folder." 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( add_custom_command(
TARGET ${VIEWER_BINARY_NAME} POST_BUILD TARGET ${VIEWER_BINARY_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
@@ -1933,6 +1940,8 @@ if (WINDOWS)
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
COMMENT "Copying winmm.dll to the runtime folder." COMMENT "Copying winmm.dll to the runtime folder."
) )
endif(WORD_SIZE EQUAL 32)
# Copying the mime_types.xml file to app_settings # 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_source "${CMAKE_SOURCE_DIR}/newview/skins/default/xui/en-us")
set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings") set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings")

4
indra/newview/llfloaterpathfindingobjects.cpp
View File

@@ -397,12 +397,14 @@ void LLFloaterPathfindingObjects::addObjectToScrollList(const LLPathfindingObjec
} }
LLScrollListItem *scrollListItem = mObjectsScrollList->addElement(rowParams); LLScrollListItem *scrollListItem = mObjectsScrollList->addElement(rowParams);
// Singu TODO::WIN64
#if !defined(_WIN64)
if (pObjectPtr->hasOwner() && !pObjectPtr->hasOwnerName()) if (pObjectPtr->hasOwner() && !pObjectPtr->hasOwnerName())
{ {
mMissingNameObjectsScrollListItems.insert(std::make_pair<std::string, LLScrollListItem *>(pObjectPtr->getUUID().asString(), scrollListItem)); mMissingNameObjectsScrollListItems.insert(std::make_pair<std::string, LLScrollListItem *>(pObjectPtr->getUUID().asString(), scrollListItem));
pObjectPtr->registerOwnerNameListener(boost::bind(&LLFloaterPathfindingObjects::handleObjectNameResponse, this, _1)); pObjectPtr->registerOwnerNameListener(boost::bind(&LLFloaterPathfindingObjects::handleObjectNameResponse, this, _1));
} }
#endif
} }
void LLFloaterPathfindingObjects::updateControlsOnScrollListChange() void LLFloaterPathfindingObjects::updateControlsOnScrollListChange()

7
indra/plugins/CMakeLists.txt
View File

@@ -3,7 +3,10 @@
add_subdirectory(base_basic) add_subdirectory(base_basic)
add_subdirectory(base_media) add_subdirectory(base_media)
add_subdirectory(filepicker) add_subdirectory(filepicker)
# Singu TODO::WIN64
if (NOT WINDOWS OR WORD_SIZE EQUAL 32)
add_subdirectory(webkit) add_subdirectory(webkit)
endif (NOT WINDOWS OR WORD_SIZE EQUAL 32)
if (LINUX) if (LINUX)
add_subdirectory(gstreamer010) add_subdirectory(gstreamer010)
@@ -13,9 +16,9 @@ if (WINDOWS OR DARWIN)
add_subdirectory(quicktime) add_subdirectory(quicktime)
endif (WINDOWS OR DARWIN) endif (WINDOWS OR DARWIN)
if (WINDOWS) if (WINDOWS AND WORD_SIZE EQUAL 32)
add_subdirectory(winmmshim) add_subdirectory(winmmshim)
endif (WINDOWS) endif (WINDOWS AND WORD_SIZE EQUAL 32)
add_subdirectory(example_basic) add_subdirectory(example_basic)
add_subdirectory(example_media) add_subdirectory(example_media)

2
indra/plugins/base_basic/CMakeLists.txt
View File

@@ -17,7 +17,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32) if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS) if(WINDOWS)
add_definitions(/FIXED:NO) # add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC) add_definitions(-fPIC)
endif(WINDOWS) endif(WINDOWS)

2
indra/plugins/base_media/CMakeLists.txt
View File

@@ -31,7 +31,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32) if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS) if(WINDOWS)
add_definitions(/FIXED:NO) # add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC) add_definitions(-fPIC)
endif(WINDOWS) endif(WINDOWS)

2
indra/plugins/example_basic/CMakeLists.txt
View File

@@ -19,7 +19,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32) if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS) if(WINDOWS)
add_definitions(/FIXED:NO) # add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC) add_definitions(-fPIC)
endif(WINDOWS) endif(WINDOWS)

2
indra/plugins/example_media/CMakeLists.txt
View File

@@ -30,7 +30,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32) if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS) if(WINDOWS)
add_definitions(/FIXED:NO) # add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC) add_definitions(-fPIC)
endif(WINDOWS) endif(WINDOWS)

2
indra/plugins/filepicker/CMakeLists.txt
View File

@@ -25,7 +25,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32) if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS) if(WINDOWS)
add_definitions(/FIXED:NO) # add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC) add_definitions(-fPIC)
endif(WINDOWS) endif(WINDOWS)

2
indra/plugins/webkit/CMakeLists.txt
View File

@@ -35,7 +35,7 @@ include_directories(
if(NOT WORD_SIZE EQUAL 32) if(NOT WORD_SIZE EQUAL 32)
if(WINDOWS) if(WINDOWS)
add_definitions(/FIXED:NO) # add_definitions(/FIXED:NO)
else(WINDOWS) # not windows therefore gcc LINUX and DARWIN else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
add_definitions(-fPIC) add_definitions(-fPIC)
endif(WINDOWS) endif(WINDOWS)

168
install.xml
View File

@@ -64,6 +64,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/glod-1.0pre4-windows-20110610.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/glod-1.0pre4-windows-20110610.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>df67aeb1ca4681dc4d9a556454203426</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/glod-1.0pre4-windows64-20131020.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>SDL</key> <key>SDL</key>
@@ -126,6 +133,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/apr_suite-1.4.2-windows-20110504.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/apr_suite-1.4.2-windows-20110504.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>7dcae03cad9bc04ac7e937284e6d102e</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/apr_suite-1.4.5-windows64-20131019.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>ares</key> <key>ares</key>
@@ -166,6 +180,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/ares-1.7.1-windows-20110504.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/ares-1.7.1-windows-20110504.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>2ca54250b59170f3e5342dacad529859</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/ares-1.9.1-windows64-20131019.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>boost</key> <key>boost</key>
@@ -206,6 +227,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/boost-1.52.0-windows-20130221.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/boost-1.52.0-windows-20130221.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>68c056e920ba2b25c0acded6f482a2e4</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/boost-1.53.0-windows64-20131019.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>colladadom</key> <key>colladadom</key>
@@ -246,6 +274,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-windows-20131006.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-windows-20131006.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>acbe863e1b3df636e1245cc27c280e7b</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/colladadom-2.2-windows64-20131020.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>curl</key> <key>curl</key>
@@ -286,6 +321,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/curl-7.21.1-windows-20110504.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/curl-7.21.1-windows-20110504.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>ffb31d596f41b650bed49ac13bb513de</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/curl-7.24.0-windows64-20131019.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>db</key> <key>db</key>
@@ -400,6 +442,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/expat-2.0.1-windows-20110215.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/expat-2.0.1-windows-20110215.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>3239d5c50d6f2c857cc1a95674dbd1f5</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/expat-2.1.0-windows64-20131019.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>fontconfig</key> <key>fontconfig</key>
@@ -441,6 +490,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/freeglut-2.6.0-windows-20110214.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/freeglut-2.6.0-windows-20110214.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>74758efd7fc6246f704ea702c4b3e310</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/freeglut-2.6.0-windows-20110214.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>freetype</key> <key>freetype</key>
@@ -481,6 +537,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/freetype-2.4.4-windows-20110218.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/freetype-2.4.4-windows-20110218.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>bfde86bbd84536448ac2a717ed1646d8</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/freetype-2.5.0.1-windows64-20131020.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>glext</key> <key>glext</key>
@@ -514,6 +577,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/glext-82-win32-linux.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/glext-82-win32-linux.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>efc62daedd2f89b46ef0e466b3ef460c</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/glext-82-win32-linux.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>glib</key> <key>glib</key>
@@ -560,6 +630,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/glui-2.36-windows-20110214.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/glui-2.36-windows-20110214.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>eeec9982df843043a18748276bbf39ce</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/glui-2.36-windows-20110214.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>google_breakpad</key> <key>google_breakpad</key>
@@ -596,6 +673,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/google_breakpad-0.0.0-rev1099-windows-20131002.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/google_breakpad-0.0.0-rev1099-windows-20131002.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>b13ebfa3a82d5396709c57ad83999d83</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/google_breakpad-0.0.0-rev1099-windows64-20131019.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>gperftools</key> <key>gperftools</key>
@@ -710,6 +794,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/hunspell-windows-20120704.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/hunspell-windows-20120704.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>d3ee81e7dfe338b46efc2830930e771e</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/libhunspell-1.3.2-windows64-20131020.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>jpeglib</key> <key>jpeglib</key>
@@ -750,6 +841,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/jpeglib-8c-windows-20120704.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/jpeglib-8c-windows-20120704.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>ae1e481e0538365d3c69a7801dff9467</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/jpeglib-8c-windows64-20131020.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>jsoncpp</key> <key>jsoncpp</key>
@@ -790,6 +888,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/jsoncpp-0.5.0-windows-20120704.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/jsoncpp-0.5.0-windows-20120704.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>8cf95eef2a95b71eb4a8ab59779bed52</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/jsoncpp-0.5.0-windows64-20131020.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>libpng</key> <key>libpng</key>
@@ -830,6 +935,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/libpng-1.5.2-windows-20120704.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/libpng-1.5.2-windows-20120704.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>9d2b32caa8b91ccb5c46be6a53eb071b</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/libpng-1.5.10-windows64-20131020.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>libuuid</key> <key>libuuid</key>
@@ -914,6 +1026,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-4.7.1-windows-20120228.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-4.7.1-windows-20120228.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>ccb96fa1260ef6c3060d407b8c6b3972</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-4.7.1-windows-20120228.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>mesa</key> <key>mesa</key>
@@ -980,6 +1099,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/libndofdev-windows-20120704.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/libndofdev-windows-20120704.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>b59b4ddab26d4441829f50b48925baf0</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/libndofdev-0.1-windows64-20131020.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>ogg-vorbis</key> <key>ogg-vorbis</key>
@@ -1020,6 +1146,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/ogg_vorbis-1.2.2-1.3.2-windows-20110510.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/ogg_vorbis-1.2.2-1.3.2-windows-20110510.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>a8ca0eef3d74936d504dab52ecc61ced</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/ogg_vorbis-1.2.2-1.3.2-windows64-20131020.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>openSSL</key> <key>openSSL</key>
@@ -1056,6 +1189,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/openssl-1.0.0g-windows-20120207.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/openssl-1.0.0g-windows-20120207.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>b50166f0b0a275c8ea0d3b11c578d792</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/openssl-1.0.0g-windows64-20131019.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>openal-soft</key> <key>openal-soft</key>
@@ -1089,6 +1229,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/openal-1.12.854-1.1.0-windows-20110301.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/openal-1.12.854-1.1.0-windows-20110301.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>e75f1529adcaa6e508d1725f59d93a16</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/openal-1.12.854-1.1.0-windows-20110301.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>pcre</key> <key>pcre</key>
@@ -1205,6 +1352,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-windows-20090309.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-windows-20090309.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>752daa90e07c05202d1f76980cb955eb</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-windows-20090309.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>xmlrpc-epi</key> <key>xmlrpc-epi</key>
@@ -1245,6 +1399,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/xmlrpc_epi-0.54.1-windows-20120704.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/xmlrpc_epi-0.54.1-windows-20120704.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>94c26b93b855f5816bb29f308d9997fb</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/xmlrpc_epi-0.54.1-windows64-20131019.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
<key>zlib</key> <key>zlib</key>
@@ -1285,6 +1446,13 @@
<key>url</key> <key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/zlib-1.2.5-windows-20120704.tar.bz2</uri> <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/zlib-1.2.5-windows-20120704.tar.bz2</uri>
</map> </map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>5aa50bd41d6cf0262a94760ef66bdbcf</string>
<key>url</key>
<uri>https://files.streamgrid.net/win64/singularity/zlib-1.2.8-windows64-20131019.tar.bz2</uri>
</map>
</map> </map>
</map> </map>
</map> </map>