merge

Tue, 07 Feb 2012 11:18:55 -0600

author
Nicky Perian
date
Tue, 07 Feb 2012 11:18:55 -0600
changeset 1638
bd909582d0bf
parent 1600
b2e9fcf499c5
parent 1637
a8be50d2825c
child 1639
ce752eaf97fe

merge

indra/cmake/00-Common.cmake file | annotate | diff | revisions
indra/cmake/Boost.cmake file | annotate | diff | revisions
indra/cmake/CopyWinLibs.cmake file | annotate | diff | revisions
indra/llcommon/llstring.cpp file | annotate | diff | revisions
indra/llcommon/llstring.h file | annotate | diff | revisions
indra/newview/CMakeLists.txt file | annotate | diff | revisions
indra/newview/viewer_manifest.py file | annotate | diff | revisions
install.xml file | annotate | diff | revisions
     1.1 --- a/indra/cmake/00-Common.cmake	Tue Dec 13 16:39:11 2011 +0100
     1.2 +++ b/indra/cmake/00-Common.cmake	Tue Feb 07 11:18:55 2012 -0600
     1.3 @@ -80,7 +80,7 @@
     1.4        /arch:SSE2
     1.5        )
     1.6       
     1.7 -  if(MSVC80 OR MSVC90)
     1.8 +  if(MSVC80 OR MSVC90 OR MSVC10)
     1.9      set(CMAKE_CXX_FLAGS_RELEASE
    1.10        "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
    1.11        CACHE STRING "C++ compiler release options" FORCE)
    1.12 @@ -88,7 +88,7 @@
    1.13      add_definitions(
    1.14        /Zc:wchar_t-
    1.15        )
    1.16 -  endif (MSVC80 OR MSVC90)
    1.17 +  endif (MSVC80 OR MSVC90 OR MSVC10)
    1.18    
    1.19    # Are we using the crummy Visual Studio KDU build workaround?
    1.20    if (NOT VS_DISABLE_FATAL_WARNINGS)
    1.21 @@ -107,7 +107,16 @@
    1.22      elseif (MSVC90)
    1.23  	    set(MSVC_DIR 9.0)
    1.24  	    set(MSVC_SUFFIX 90)
    1.25 +    elseif (MSVC10)
    1.26 +	    set(MSVC_DIR 10.0)
    1.27 +	    set(MSVC_SUFFIX 100)
    1.28      endif (MSVC71)
    1.29 +
    1.30 +if (MSVC10)
    1.31 +    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
    1.32 +    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO")
    1.33 +    SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
    1.34 +  endif(MSVC10)
    1.35      
    1.36  endif (WINDOWS)
    1.37  
     2.1 --- a/indra/cmake/Boost.cmake	Tue Dec 13 16:39:11 2011 +0100
     2.2 +++ b/indra/cmake/Boost.cmake	Tue Feb 07 11:18:55 2012 -0600
     2.3 @@ -11,7 +11,7 @@
     2.4    set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
     2.5  
     2.6    if (WINDOWS)
     2.7 -    set(BOOST_VERSION 1_43)
     2.8 +    set(BOOST_VERSION 1_45)
     2.9      if (MSVC80)
    2.10        set(Boost_PROGRAM_OPTIONS_LIBRARY 
    2.11            optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
    2.12 @@ -25,13 +25,7 @@
    2.13        set(Boost_WAVE_LIBRARY 
    2.14            optimized libboost_wave-vc80-mt-${BOOST_VERSION}
    2.15            debug libboost_wave-vc80-mt-gd-${BOOST_VERSION})
    2.16 -      set(Boost_SYSTEM_LIBRARY 
    2.17 -          optimized libboost_system-vc80-mt-${BOOST_VERSION}
    2.18 -          debug libboost_system-vc80-mt-gd-${BOOST_VERSION})
    2.19 -      set(Boost_FILESYSTEM_LIBRARY 
    2.20 -          optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
    2.21 -          debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
    2.22 -	  else (MSVC90)
    2.23 +    elseif (MSVC90)
    2.24        set(Boost_PROGRAM_OPTIONS_LIBRARY 
    2.25            optimized libboost_program_options-vc90-mt-${BOOST_VERSION}
    2.26            debug libboost_program_options-vc90-mt-gd-${BOOST_VERSION})
    2.27 @@ -44,18 +38,25 @@
    2.28        set(Boost_WAVE_LIBRARY 
    2.29            optimized libboost_wave-vc90-mt-${BOOST_VERSION}
    2.30            debug libboost_wave-vc90-mt-gd-${BOOST_VERSION})
    2.31 -      set(Boost_SYSTEM_LIBRARY 
    2.32 -          optimized libboost_system-vc90-mt-${BOOST_VERSION}
    2.33 -          debug libboost_system-vc90-mt-gd-${BOOST_VERSION})
    2.34 -      set(Boost_FILESYSTEM_LIBRARY 
    2.35 -          optimized libboost_filesystem-vc90-mt-${BOOST_VERSION}
    2.36 -          debug libboost_filesystem-vc90-mt-gd-${BOOST_VERSION})
    2.37 +    elseif (MSVC10)
    2.38 +      set(Boost_PROGRAM_OPTIONS_LIBRARY 
    2.39 +          optimized libboost_program_options-vc100-mt-${BOOST_VERSION}
    2.40 +          debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION})
    2.41 +      set(Boost_REGEX_LIBRARY
    2.42 +          optimized libboost_regex-vc100-mt-${BOOST_VERSION}
    2.43 +          debug libboost_regex-vc100-mt-gd-${BOOST_VERSION})
    2.44 +      set(Boost_SIGNALS_LIBRARY 
    2.45 +          optimized libboost_signals-vc100-mt-${BOOST_VERSION}
    2.46 +          debug libboost_signals-vc100-mt-gd-${BOOST_VERSION})
    2.47 +      set(Boost_WAVE_LIBRARY 
    2.48 +          optimized libboost_wave-vc100-mt-${BOOST_VERSION}
    2.49 +          debug libboost_wave-vc100-mt-gd-${BOOST_VERSION})
    2.50      endif (MSVC80)
    2.51    elseif (LINUX)
    2.52    	set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)  	
    2.53    	set(Boost_REGEX_LIBRARY boost_regex-mt)
    2.54    	set(Boost_PYTHON_LIBRARY boost_python-mt)
    2.55 -#  	set(Boost_SIGNALS_LIBRARY boost_signals-mt)
    2.56 +  	set(Boost_SIGNALS_LIBRARY boost_signals-mt)
    2.57    	set(Boost_WAVE_LIBRARY boost_wave-mt)
    2.58    	set(Boost_SYSTEM_LIBRARY boost_system-mt)
    2.59    	set(Boost_FILESYSTEM_LIBRARY boost_filesystem-mt)
    2.60 @@ -66,7 +67,7 @@
    2.61    	set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options)  	
    2.62    	set(Boost_REGEX_LIBRARY boost_regex)
    2.63    	set(Boost_PYTHON_LIBRARY boost_python)
    2.64 -#  	set(Boost_SIGNALS_LIBRARY boost_signals)
    2.65 +  	set(Boost_SIGNALS_LIBRARY boost_signals)
    2.66    	set(Boost_WAVE_LIBRARY boost_wave)
    2.67    	set(Boost_SYSTEM_LIBRARY boost_system)
    2.68    	set(Boost_FILESYSTEM_LIBRARY boost_filesystem)
     3.1 --- a/indra/cmake/CopyWinLibs.cmake	Tue Dec 13 16:39:11 2011 +0100
     3.2 +++ b/indra/cmake/CopyWinLibs.cmake	Tue Feb 07 11:18:55 2012 -0600
     3.3 @@ -5,6 +5,20 @@
     3.4  # VisualStudio. 
     3.5  
     3.6  include(CMakeCopyIfDifferent)
     3.7 +# Provide compiler version awareness
     3.8 +   if (MSVC71)
     3.9 +        set(MSVC_DIR 7.1)
    3.10 +        set(MSVC_SUFFIX 71)
    3.11 +    elseif (MSVC80)
    3.12 +        set(MSVC_DIR 8.0)
    3.13 +        set(MSVC_SUFFIX 80)
    3.14 +    elseif (MSVC90)
    3.15 +        set(MSVC_DIR 9.0)
    3.16 +        set(MSVC_SUFFIX 90)
    3.17 +    elseif (MSVC10)
    3.18 +        set(MSVC_DIR 10.0)
    3.19 +        set(MSVC_SUFFIX 100)
    3.20 +    endif (MSVC71)
    3.21  
    3.22  set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
    3.23  set(vivox_files
    3.24 @@ -335,105 +349,6 @@
    3.25     
    3.26  endif (EXISTS ${internal_llkdu_path})
    3.27  
    3.28 -# Copy MS C runtime dlls, required for packaging.
    3.29 -# *TODO - Adapt this to support VC9
    3.30 -if (MSVC80)
    3.31 -    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
    3.32 -        PATHS
    3.33 -         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
    3.34 -        NO_DEFAULT_PATH
    3.35 -        NO_DEFAULT_PATH
    3.36 -        )
    3.37 -
    3.38 -    if(EXISTS ${debug_msvc8_redist_path})
    3.39 -        set(debug_msvc8_files
    3.40 -            msvcr80d.dll
    3.41 -            msvcp80d.dll
    3.42 -            Microsoft.VC80.DebugCRT.manifest
    3.43 -            )
    3.44 -
    3.45 -        copy_if_different(
    3.46 -            ${debug_msvc8_redist_path} 
    3.47 -            "${CMAKE_CURRENT_BINARY_DIR}/Debug"
    3.48 -            out_targets 
    3.49 -            ${debug_msvc8_files}
    3.50 -            )
    3.51 -        set(all_targets ${all_targets} ${out_targets})
    3.52 -
    3.53 -        set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/secondlife-bin.exe.config)
    3.54 -        add_custom_command(
    3.55 -            OUTPUT ${debug_appconfig_file}
    3.56 -            COMMAND ${PYTHON_EXECUTABLE}
    3.57 -            ARGS
    3.58 -              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
    3.59 -              ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
    3.60 -              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config
    3.61 -              ${debug_appconfig_file}
    3.62 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
    3.63 -            COMMENT "Creating debug app config file"
    3.64 -            )
    3.65 -
    3.66 -    endif (EXISTS ${debug_msvc8_redist_path})
    3.67 -
    3.68 -    FIND_PATH(release_msvc8_redist_path msvcr80.dll
    3.69 -        PATHS
    3.70 -         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
    3.71 -        NO_DEFAULT_PATH
    3.72 -        NO_DEFAULT_PATH
    3.73 -        )
    3.74 -
    3.75 -    if(EXISTS ${release_msvc8_redist_path})
    3.76 -        set(release_msvc8_files
    3.77 -            msvcr80.dll
    3.78 -            msvcp80.dll
    3.79 -            Microsoft.VC80.CRT.manifest
    3.80 -            )
    3.81 -
    3.82 -        copy_if_different(
    3.83 -            ${release_msvc8_redist_path} 
    3.84 -            "${CMAKE_CURRENT_BINARY_DIR}/Release"
    3.85 -            out_targets 
    3.86 -            ${release_msvc8_files}
    3.87 -            )
    3.88 -        set(all_targets ${all_targets} ${out_targets})
    3.89 -
    3.90 -        copy_if_different(
    3.91 -            ${release_msvc8_redist_path} 
    3.92 -            "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
    3.93 -            out_targets 
    3.94 -            ${release_msvc8_files}
    3.95 -            )
    3.96 -        set(all_targets ${all_targets} ${out_targets})
    3.97 -
    3.98 -        set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/secondlife-bin.exe.config)
    3.99 -        add_custom_command(
   3.100 -            OUTPUT ${release_appconfig_file}
   3.101 -            COMMAND ${PYTHON_EXECUTABLE}
   3.102 -            ARGS
   3.103 -              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
   3.104 -              ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
   3.105 -              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
   3.106 -              ${release_appconfig_file}
   3.107 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
   3.108 -            COMMENT "Creating release app config file"
   3.109 -            )
   3.110 -
   3.111 -        set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/secondlife-bin.exe.config)
   3.112 -        add_custom_command(
   3.113 -            OUTPUT ${relwithdebinfo_appconfig_file}
   3.114 -            COMMAND ${PYTHON_EXECUTABLE}
   3.115 -            ARGS
   3.116 -              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
   3.117 -              ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
   3.118 -              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
   3.119 -              ${relwithdebinfo_appconfig_file}
   3.120 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
   3.121 -            COMMENT "Creating relwithdebinfo app config file"
   3.122 -            )
   3.123 -          
   3.124 -    endif (EXISTS ${release_msvc8_redist_path})
   3.125 -endif (MSVC80)
   3.126 -
   3.127  add_custom_target(copy_win_libs ALL
   3.128    DEPENDS 
   3.129      ${all_targets}
     4.1 --- a/indra/cmake/JsonCpp.cmake	Tue Dec 13 16:39:11 2011 +0100
     4.2 +++ b/indra/cmake/JsonCpp.cmake	Tue Feb 07 11:18:55 2012 -0600
     4.3 @@ -18,6 +18,10 @@
     4.4        set(JSONCPP_LIBRARIES 
     4.5          debug json_vc90d
     4.6          optimized json_vc90)
     4.7 +    elseif (MSVC10)
     4.8 +      set(JSONCPP_LIBRARIES 
     4.9 +        debug json_vc10d
    4.10 +        optimized json_vc10)
    4.11  	endif(MSVC80)
    4.12    elseif (DARWIN)
    4.13      set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
     5.1 --- a/indra/develop.py	Tue Dec 13 16:39:11 2011 +0100
     5.2 +++ b/indra/develop.py	Tue Feb 07 11:18:55 2012 -0600
     5.3 @@ -481,11 +481,16 @@
     5.4          'vc90' : {
     5.5              'gen' : r'Visual Studio 9 2008',
     5.6              'ver' : r'9.0'
     5.7 +            },
     5.8 +        'vc100' : {
     5.9 +            'gen' : r'Visual Studio 10',
    5.10 +            'ver' : r'10.0'
    5.11              }
    5.12          }
    5.13      gens['vs2003'] = gens['vc71']
    5.14      gens['vs2005'] = gens['vc80']
    5.15      gens['vs2008'] = gens['vc90']
    5.16 +    gens['vs2010'] = gens['vc100']
    5.17  
    5.18      search_path = r'C:\windows'
    5.19      exe_suffixes = ('.exe', '.bat', '.com')
    5.20 @@ -497,14 +502,14 @@
    5.21  
    5.22      def _get_generator(self):
    5.23          if self._generator is None:
    5.24 -            for version in 'vc80 vc90 vc71'.split():
    5.25 +            for version in 'vc80 vc90 vc100 vc71'.split():
    5.26                  if self.find_visual_studio(version):
    5.27                      self._generator = version
    5.28                      print 'Building with ', self.gens[version]['gen']
    5.29                      break
    5.30              else:
    5.31                      print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
    5.32 -                    for version in 'vc80 vc90 vc71'.split():
    5.33 +                    for version in 'vc80 vc90 vc100 vc71'.split():
    5.34                          if self.find_visual_studio_express(version):
    5.35                              self._generator = version
    5.36                              self.using_express = True
    5.37 @@ -598,7 +603,7 @@
    5.38      def get_build_cmd(self):
    5.39          if self.incredibuild:
    5.40              config = self.build_type
    5.41 -            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:
    5.42 +            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0' ]:
    5.43                  config = '\"%s|Win32\"' % config
    5.44  
    5.45              return "buildconsole %s.sln /build %s" % (self.project_name, config)
    5.46 @@ -723,8 +728,8 @@
    5.47    -m32 | -m64           build architecture (32-bit or 64-bit)
    5.48    -N | --no-distcc      disable use of distcc
    5.49    -G | --generator=NAME generator name
    5.50 -                        Windows: VC71 or VS2003 (default), VC80 (VS2005) or 
    5.51 -                          VC90 (VS2008)
    5.52 +                        Windows: VC71 or VS2003, VC80 (VS2005) (default)  
    5.53 +                          VC90 (VS2008), or VC100 (VS2010)
    5.54                          Mac OS X: Xcode (default), Unix Makefiles
    5.55                          Linux: Unix Makefiles (default), KDevelop3
    5.56    -p | --project=NAME   set the root project name. (Doesn't effect makefiles)
     6.1 --- a/indra/llaudio/llaudiodecodemgr.h	Tue Dec 13 16:39:11 2011 +0100
     6.2 +++ b/indra/llaudio/llaudiodecodemgr.h	Tue Feb 07 11:18:55 2012 -0600
     6.3 @@ -39,6 +39,7 @@
     6.4  
     6.5  #include "llassettype.h"
     6.6  #include "llframetimer.h"
     6.7 +#include <iterator> 
     6.8  
     6.9  class LLVFS;
    6.10  class LLVorbisDecodeState;
     7.1 --- a/indra/llcommon/llstring.cpp	Tue Dec 13 16:39:11 2011 +0100
     7.2 +++ b/indra/llcommon/llstring.cpp	Tue Feb 07 11:18:55 2012 -0600
     7.3 @@ -179,10 +179,10 @@
     7.4  	return outchars - base;
     7.5  }	
     7.6  
     7.7 -S32 utf16chars_to_wchar(const U16* inchars, llwchar* outchar)
     7.8 +S32 utf16chars_to_wchar(const wchar_t* inchars, llwchar* outchar)
     7.9  {
    7.10 -	const U16* base = inchars;
    7.11 -	U16 cur_char = *inchars++;
    7.12 +	const wchar_t* base = inchars;
    7.13 +	wchar_t cur_char = *inchars++;
    7.14  	llwchar char32 = cur_char;
    7.15  	if ((cur_char >= 0xD800) && (cur_char <= 0xDFFF))
    7.16  	{
    7.17 @@ -241,7 +241,7 @@
    7.18  
    7.19  	S32 i = 0;
    7.20  	// craziness to make gcc happy (llutf16string.c_str() is tweaked on linux):
    7.21 -	const U16* chars16 = &(*(utf16str.begin()));
    7.22 +	const wchar_t* chars16 = &(*(utf16str.begin()));
    7.23  	while (i < len)
    7.24  	{
    7.25  		llwchar cur_char;
    7.26 @@ -262,18 +262,18 @@
    7.27  {
    7.28  	S32 surrogate_pairs = 0;
    7.29  	// ... craziness to make gcc happy (llutf16string.c_str() is tweaked on linux):
    7.30 -	const U16 *const utf16_chars = &(*(utf16str.begin()));
    7.31 +	const wchar_t *const utf16_chars = &(*(utf16str.begin()));
    7.32  	S32 i = 0;
    7.33  	while (i < utf16_len)
    7.34  	{
    7.35 -		const U16 c = utf16_chars[i++];
    7.36 +		const wchar_t c = utf16_chars[i++];
    7.37  		if (c >= 0xD800 && c <= 0xDBFF)		// See http://en.wikipedia.org/wiki/UTF-16
    7.38  		{   // Have first byte of a surrogate pair
    7.39  			if (i >= utf16_len)
    7.40  			{
    7.41  				break;
    7.42  			}
    7.43 -			const U16 d = utf16_chars[i];
    7.44 +			const wchar_t d = utf16_chars[i];
    7.45  			if (d >= 0xDC00 && d <= 0xDFFF)
    7.46  			{   // Have valid second byte of a surrogate pair
    7.47  				surrogate_pairs++;
     8.1 --- a/indra/llcommon/llstring.h	Tue Dec 13 16:39:11 2011 +0100
     8.2 +++ b/indra/llcommon/llstring.h	Tue Feb 07 11:18:55 2012 -0600
     8.3 @@ -448,7 +448,7 @@
     8.4  //
     8.5  // We should never use UTF16 except when communicating with Win32!
     8.6  //
     8.7 -typedef std::basic_string<U16> llutf16string;
     8.8 +typedef std::basic_string<wchar_t> llutf16string;
     8.9  
    8.10  LL_COMMON_API LLWString utf16str_to_wstring(const llutf16string &utf16str, S32 len);
    8.11  LL_COMMON_API LLWString utf16str_to_wstring(const llutf16string &utf16str);
     9.1 --- a/indra/llmessage/llbuffer.h	Tue Dec 13 16:39:11 2011 +0100
     9.2 +++ b/indra/llmessage/llbuffer.h	Tue Feb 07 11:18:55 2012 -0600
     9.3 @@ -44,7 +44,7 @@
     9.4  
     9.5  #include <list>
     9.6  #include <vector>
     9.7 -
     9.8 +#include <iterator>
     9.9  /** 
    9.10   * @class LLChannelDescriptors
    9.11   * @brief A way simple interface to accesss channels inside a buffer
    10.1 --- a/indra/newview/CMakeLists.txt	Tue Dec 13 16:39:11 2011 +0100
    10.2 +++ b/indra/newview/CMakeLists.txt	Tue Feb 07 11:18:55 2012 -0600
    10.3 @@ -1389,10 +1389,13 @@
    10.4  
    10.5  if (WINDOWS)
    10.6      if(MSVC71)
    10.7 -        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES")
    10.8 +        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES /LARGEADDRESSAWARE")
    10.9      else(MSVC71)
   10.10 -        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
   10.11 +        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /LARGEADDRESSAWARE")
   10.12      endif(MSVC71)
   10.13 +    if (MSVC10) 
   10.14 +        set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map /LARGEADDRESSAWARE") 
   10.15 +    endif(MSVC10) 
   10.16      
   10.17      set_target_properties(${VIEWER_BINARY_NAME}
   10.18          PROPERTIES
   10.19 @@ -1402,19 +1405,19 @@
   10.20          )
   10.21  
   10.22      # sets the 'working directory' for debugging from visual studio.
   10.23 -    if (NOT UNATTENDED)
   10.24 -        add_custom_command(
   10.25 -            TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
   10.26 -            COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
   10.27 -            ARGS
   10.28 -              --solution 
   10.29 -              ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
   10.30 -              --workingdir
   10.31 -              ${VIEWER_BINARY_NAME}
   10.32 -              ${CMAKE_CURRENT_SOURCE_DIR}
   10.33 -            COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
   10.34 -            )
   10.35 -    endif (NOT UNATTENDED)
   10.36 +    #if (NOT UNATTENDED)
   10.37 +    #    add_custom_command(
   10.38 +    #        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
   10.39 +    #        COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
   10.40 +    #        ARGS
   10.41 +    #          --solution 
   10.42 +    #          ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
   10.43 +    #          --workingdir
   10.44 +    #          ${VIEWER_BINARY_NAME}
   10.45 +    #          ${CMAKE_CURRENT_SOURCE_DIR}
   10.46 +    #        COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
   10.47 +    #        )
   10.48 +    #endif (NOT UNATTENDED)
   10.49  
   10.50      add_custom_command(
   10.51          TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
    11.1 --- a/indra/newview/viewer_manifest.py	Tue Dec 13 16:39:11 2011 +0100
    11.2 +++ b/indra/newview/viewer_manifest.py	Tue Feb 07 11:18:55 2012 -0600
    11.3 @@ -279,13 +279,13 @@
    11.4                  # These need to be installed as a SxS assembly, currently a 'private' assembly.
    11.5                  # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
    11.6                  if self.args['configuration'].lower() == 'debug':
    11.7 -                    self.path("msvcr80d.dll")
    11.8 -                    self.path("msvcp80d.dll")
    11.9 -                    self.path("Microsoft.VC80.DebugCRT.manifest")
   11.10 +                    self.path("msvcr100d.dll")
   11.11 +                    self.path("msvcp100d.dll")
   11.12 +                    self.path("Microsoft.VC100.DebugCRT.manifest")
   11.13                  else:
   11.14 -                    self.path("msvcr80.dll")
   11.15 -                    self.path("msvcp80.dll")
   11.16 -                    self.path("Microsoft.VC80.CRT.manifest")
   11.17 +                    self.path("msvcr100.dll")
   11.18 +                    self.path("msvcp100.dll")
   11.19 +                    self.path("Microsoft.VC100.CRT.manifest")
   11.20              except RuntimeError:
   11.21                  print "WARNING: not copying VC runtimes to staging area, this will fail if you make an installer from this staging"
   11.22  
    12.1 Binary file indra/tools/vstool/VSTool.exe has changed
    13.1 --- a/indra/tools/vstool/main.cs	Tue Dec 13 16:39:11 2011 +0100
    13.2 +++ b/indra/tools/vstool/main.cs	Tue Feb 07 11:18:55 2012 -0600
    13.3 @@ -550,6 +550,10 @@
    13.4                      case "10.00":
    13.5                          version = "VC90";
    13.6                          break;
    13.7 +
    13.8 +                    case "11.00":
    13.9 +                        version = "VC100";
   13.10 +                        break;
   13.11                      default:
   13.12                          throw new ApplicationException("Unknown .sln version: " + format);
   13.13                  }
   13.14 @@ -585,6 +589,10 @@
   13.15                  case "VC90":
   13.16                      progid = "VisualStudio.DTE.9.0";
   13.17                      break;
   13.18 +
   13.19 +                case "VC100":
   13.20 +                    progid = "VisualStudio.DTE.10.0";
   13.21 +                    break;
   13.22                  default:
   13.23                      throw new ApplicationException("Can't handle VS version: " + version);
   13.24              }
    14.1 --- a/install.xml	Tue Dec 13 16:39:11 2011 +0100
    14.2 +++ b/install.xml	Tue Feb 07 11:18:55 2012 -0600
    14.3 @@ -1,275 +1,608 @@
    14.4  <?xml version="1.0"?>
    14.5  <llsd>
    14.6 -  <map>
    14.7 -    <key>installables</key>
    14.8 -    <map>
    14.9 -      <key>pcre</key>
   14.10 -      <map>
   14.11 -        <key>copyright</key>
   14.12 -        <string>Copyright (c) 1997-2008 University of Cambridge</string>
   14.13 -        <key>description</key>
   14.14 -        <string>Regular expression library</string>
   14.15 -        <key>license</key>
   14.16 -        <string>bsd</string>
   14.17 -        <key>packages</key>
   14.18 -        <map>
   14.19 -          <key>darwin</key>
   14.20 -          <map>
   14.21 -            <key>md5sum</key>
   14.22 -            <string>63e2dc55142b8b36521c1b0c9b6ed6bb</string>
   14.23 -            <key>url</key>
   14.24 -            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pcre-7.6-darwin-20090730.tar.bz2</uri>
   14.25 -          </map>
   14.26 -          <key>linux</key>
   14.27 -          <map>
   14.28 -            <key>md5sum</key>
   14.29 -            <string>0886d0b1cdf104b6341df1832a8a7e09</string>
   14.30 -            <key>url</key>
   14.31 -            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pcre-7.6-linux-20090804.tar.bz2</uri>
   14.32 -          </map>
   14.33 -        </map>
   14.34 -      </map>
   14.35 -      <key>llconvexdecompositionstub</key>
   14.36 -      <map>
   14.37 -        <key>copyright</key>
   14.38 -        <string>on file</string>
   14.39 -        <key>description</key>
   14.40 -        <string>stub version of Convex decomposition utility for mesh</string>
   14.41 -        <key>license</key>
   14.42 -        <string>lgpl</string>
   14.43 -        <key>packages</key>
   14.44 -        <map>
   14.45 -          <key>windows</key>
   14.46 -          <map>
   14.47 -            <key>md5sum</key>
   14.48 -            <string>292b14bd3a480484c74b7ca4693b427a</string>
   14.49 -            <key>url</key>
   14.50 -            <uri>http://downloads.phoenixviewer.com/llconvexdecompositionstub-0.3a-windows-vc80-20110826.tar.bz2</uri>
   14.51 -          </map>
   14.52 -          <key>darwin</key>
   14.53 -          <map>
   14.54 -            <key>md5sum</key>
   14.55 -            <string>dd508e3feb5ab5346f3e5ddc35b6ba67</string>
   14.56 -            <key>url</key>
   14.57 -            <uri>http://downloads.phoenixviewer.com/llconvexdecompositionstub-0.3a-darwin-20110819.tar.bz2</uri>
   14.58 -          </map>
   14.59 -          <key>linux</key>
   14.60 -          <map>
   14.61 -            <key>md5sum</key>
   14.62 -            <string>0271278d53c26d76994e347c255558c5</string>
   14.63 -            <key>url</key>
   14.64 -            <uri>http://downloads.phoenixviewer.com/llconvexdecompositionstub-0.3a-linux-20110819.tar.bz2</uri>
   14.65 -          </map>
   14.66 -        </map>
   14.67 -      </map>
   14.68 -      <key>colladadom</key>
   14.69 -      <map>
   14.70 -        <key>copyright</key>
   14.71 -        <string>Copyright 2005 Sony Computer Entertainment Inc.</string>
   14.72 -        <key>description</key>
   14.73 -        <string>Library for processing collada file format</string>
   14.74 -        <key>license</key>
   14.75 -        <string>scea</string>
   14.76 -        <key>packages</key>
   14.77 -        <map>
   14.78 -          <key>darwin</key>
   14.79 -          <map>
   14.80 -            <key>md5sum</key>
   14.81 -            <string>a0c7bc028cdf3c96216a815587d64c41</string>
   14.82 -            <key>url</key>
   14.83 -            <uri>http://downloads.phoenixviewer.com/colladadom-2.2-darwin-20110420.tar.bz2</uri>
   14.84 -          </map>
   14.85 -          <key>linux</key>
   14.86 -          <map>
   14.87 -            <key>md5sum</key>
   14.88 -            <string>3c5f3a7a8bc2d201edfc95a755c6078c</string>
   14.89 -            <key>url</key>
   14.90 -            <uri>http://downloads.phoenixviewer.com/colladadom-2.2-linux-20110415.tar.bz2</uri>
   14.91 -          </map>
   14.92 -          <key>windows</key>
   14.93 -          <map>
   14.94 -            <key>md5sum</key>
   14.95 -            <string>090f5ea94cba30fc3386f80819abe4ee</string>
   14.96 -            <key>url</key>
   14.97 -            <uri>http://downloads.phoenixviewer.com/colladadom-2.2-windows-vc8-20110826.tar.bz2</uri>
   14.98 -          </map>
   14.99 -        </map>
  14.100 -      </map>
  14.101 -      <key>GLOD</key>
  14.102 -      <map>
  14.103 -        <key>copyright</key>
  14.104 -        <string>Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. All rights reserved.</string>
  14.105 -        <key>description</key>
  14.106 -        <string>Geometric Level of Detail for OpenGL</string>
  14.107 -        <key>license</key>
  14.108 -        <string>GLOD</string>
  14.109 -        <key>packages</key>
  14.110 -        <map>
  14.111 -          <key>darwin</key>
  14.112 -          <map>
  14.113 -            <key>md5sum</key>
  14.114 -            <string>22efacc618834397d7f0fc4a34232fd3</string>
  14.115 -            <key>url</key>
  14.116 -            <uri>http://downloads.phoenixviewer.com/glod-1.0pre4-darwin-20111019.tar.bz2</uri>
  14.117 -          </map>
  14.118 -          <key>linux</key>
  14.119 -          <map>
  14.120 -            <key>md5sum</key>
  14.121 -            <string>9d4a3107af1845116e21edbe9f27b3e7</string>
  14.122 -            <key>url</key>
  14.123 -            <uri>http://downloads.phoenixviewer.com/glod-1.0pre4-linux-20111019.tar.bz2</uri>
  14.124 -          </map>
  14.125 -          <key>windows</key>
  14.126 -          <map>
  14.127 -            <key>md5sum</key>
  14.128 -            <string>1f55ce0e6fadff74c0b37418abd3afd3</string>
  14.129 -            <key>url</key>
  14.130 -            <uri>http://downloads.phoenixviewer.com/glod-1.0pre4-windows-20111019.tar.bz2</uri>
  14.131 -          </map>
  14.132 -        </map>
  14.133 -      </map>
  14.134 -      <key>hunspell</key>
  14.135 -      <map>
  14.136 -        <key>copyright</key>
  14.137 -        <string>various</string>
  14.138 -        <key>description</key>
  14.139 -        <string>A open source spell check library</string>
  14.140 -        <key>license</key>
  14.141 -        <string>lgpl</string>
  14.142 -        <key>packages</key>
  14.143 -        <map>
  14.144 -          <key>windows</key>
  14.145 -          <map>
  14.146 -            <key>md5sum</key>
  14.147 -            <string>d5e88ffde149a0a48ae92ee365205ded</string>
  14.148 -            <key>url</key>
  14.149 -            <uri>http://downloads.phoenixviewer.com/hunspell-1.2.11-windows-20100820.tar.bz2</uri>
  14.150 -          </map>
  14.151 -          <key>linux</key>
  14.152 -          <map>
  14.153 -            <key>md5sum</key>
  14.154 -            <string>d70357289f8dd4a17bf9820f3c0f2a20</string>
  14.155 -            <key>url</key>
  14.156 -            <uri>http://downloads.phoenixviewer.com/hunspell-1.2.11-linux-20100910.tar.bz2</uri>
  14.157 -          </map>
  14.158 -          <key>darwin</key>
  14.159 -          <map>
  14.160 -            <key>md5sum</key>
  14.161 -            <string>5865352b657a79d30fe850df309845d7</string>
  14.162 -            <key>url</key>
  14.163 -            <uri>http://downloads.phoenixviewer.com/hunspell-1.2.11-darwin.tar.gz</uri>
  14.164 -          </map>
  14.165 -        </map>
  14.166 -      </map>
  14.167 -      <key>otr</key>
  14.168 -      <map>
  14.169 -        <key>copyright</key>
  14.170 -        <string>various</string>
  14.171 -        <key>description</key>
  14.172 -        <string>A open source encryption library</string>
  14.173 -        <key>license</key>
  14.174 -        <string>lgpl</string>
  14.175 -        <key>packages</key>
  14.176 -        <map>
  14.177 -          <key>linux</key>
  14.178 -          <map>
  14.179 -            <key>md5sum</key>
  14.180 -            <string>84eef12ae4c4a303e83cf20c531e8fdf</string>
  14.181 -            <key>url</key>
  14.182 -            <uri>http://downloads.phoenixviewer.com/libotr-2.2.0-linux-20101018.tar.bz2</uri>
  14.183 -          </map>
  14.184 -          <key>darwin</key>
  14.185 -          <map>
  14.186 -            <key>md5sum</key>
  14.187 -            <string>6e68314811d65a2e0ef3e338e1084f39</string>
  14.188 -            <key>url</key>
  14.189 -            <uri>http://downloads.phoenixviewer.com/libotr-darwin.tar.bz2</uri>
  14.190 -          </map>
  14.191 -        </map>
  14.192 -      </map>
  14.193 -      <key>Growl</key>
  14.194 -      <map>
  14.195 -        <key>copyright</key>
  14.196 -        <string>The Growl Project</string>
  14.197 -        <key>description</key>
  14.198 -        <string>A unified notification system for Mac OS X</string>
  14.199 -        <key>license</key>
  14.200 -        <string>bsd</string>
  14.201 -        <key>packages</key>
  14.202 -        <map>
  14.203 -          <key>darwin</key>
  14.204 -          <map>
  14.205 -            <key>md5sum</key>
  14.206 -            <string>f075e96d8e1bfdd1f518829f0d7b74af</string>
  14.207 -            <key>url</key>
  14.208 -            <uri>http://downloads.phoenixviewer.com/growl-1.2.1-darwin.tar.gz</uri>
  14.209 -          </map>
  14.210 -          <key>windows</key>
  14.211 -          <map>
  14.212 -            <key>md5sum</key>
  14.213 -            <string>5334e46f65edf330ee892a6aeab8cf24</string>
  14.214 -            <key>url</key>
  14.215 -            <uri>http://phoenixviewer.com/app/packages/growl-ph-windows-20111204.tar.bz2</uri>
  14.216 -          </map>
  14.217 -          <key>linux</key>
  14.218 -          <map>
  14.219 -            <key>md5sum</key>
  14.220 -            <string>af06208ec80b1f170cc560141602e2dc</string>
  14.221 -            <key>url</key>
  14.222 -            <uri>http://downloads.phoenixviewer.com/libnotify-0.4.4-linux-20101003.tar.bz2</uri>
  14.223 -          </map>
  14.224 -        </map>
  14.225 -      </map>
  14.226 -      <key>7zip</key>
  14.227 -      <map>
  14.228 -        <key>copyright</key>
  14.229 -        <string>Igor Pavlov</string>
  14.230 -        <key>license</key>
  14.231 -        <string>lgpl</string>
  14.232 -        <key>description</key>
  14.233 -        <string>7-Zip is a file archiver with the high compression ratio.</string>
  14.234 -        <key>packages</key>
  14.235 -        <map>
  14.236 -          <key>darwin</key>
  14.237 -          <map>
  14.238 -            <key>md5sum</key>
  14.239 -            <string>aa767999e0d405bdaed01fe3f7442dd9</string>
  14.240 -            <key>url</key>
  14.241 -            <uri>http://downloads.phoenixviewer.com/7zip-4.57-20100630.tar.bz2</uri>
  14.242 -          </map>
  14.243 -          <key>linux</key>
  14.244 -          <map>
  14.245 -            <key>md5sum</key>
  14.246 -            <string>a5a3c5f5d451a2bcaa8975dd349abf5a</string>
  14.247 -            <key>url</key>
  14.248 -            <uri>http://downloads.phoenixviewer.com/p7zip-standalone-linux-20100911.tar.bz2</uri>
  14.249 -          </map>
  14.250 -        </map>
  14.251 -      </map>
  14.252 -      <key>GL</key>
  14.253 -      <map>
  14.254 -        <key>copyright</key>
  14.255 -        <string>Copyright (c) 1991-2000 Silicon Graphics, Inc.</string>
  14.256 -        <key>description</key>
  14.257 -        <string>A standard for 3D Graphics rendering engine.</string>
  14.258 -        <key>license</key>
  14.259 -        <string>GL</string>
  14.260 -        <key>packages</key>
  14.261 -        <map>
  14.262 -          <key>darwin</key>
  14.263 -          <map>
  14.264 -            <key>md5sum</key>
  14.265 -            <string>0bd2795a2afe09f6c563f2f888f24cc9</string>
  14.266 -            <key>url</key>
  14.267 -            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-darwin-20080613.tar.bz2</uri>
  14.268 -          </map>
  14.269 -          <key>linux</key>
  14.270 -          <map>
  14.271 -            <key>md5sum</key>
  14.272 -            <string>aa5b145a5e8b111443e5f30cf6aaa95a</string>
  14.273 -            <key>url</key>
  14.274 -            <uri>http://sldev.free.fr/libraries/GL-linux-20080812.tar.bz2</uri>
  14.275 -          </map>
  14.276 +	<map>
  14.277 +		<key>installables</key>
  14.278 +		<map>
  14.279 +			<key>hunspell</key>
  14.280 +			<map>
  14.281 +				<key>copyright</key>
  14.282 +				<string>various</string>
  14.283 +				<key>description</key>
  14.284 +				<string>A open source spell check library</string>
  14.285 +				<key>license</key>
  14.286 +				<string>lgpl</string>
  14.287 +				<key>packages</key>
  14.288 +				<map>
  14.289 +					<key>windows</key>
  14.290 +					<map>
  14.291 +						<key>md5sum</key>
  14.292 +						<string>d5e88ffde149a0a48ae92ee365205ded</string>
  14.293 +						<key>url</key>
  14.294 +						<uri>http://downloads.phoenixviewer.com/hunspell-1.2.11-windows-20100820.tar.bz2</uri>
  14.295 +					</map>
  14.296 +					<key>linux</key>
  14.297 +					<map>
  14.298 +						<key>md5sum</key>
  14.299 +						<string>d70357289f8dd4a17bf9820f3c0f2a20</string>
  14.300 +						<key>url</key>
  14.301 +						<uri>http://downloads.phoenixviewer.com/hunspell-1.2.11-linux-20100910.tar.bz2</uri>
  14.302 +					</map>
  14.303 +					<key>darwin</key>
  14.304 +					<map>
  14.305 +						<key>md5sum</key>
  14.306 +						<string>5865352b657a79d30fe850df309845d7</string>
  14.307 +						<key>url</key>
  14.308 +						<uri>http://downloads.phoenixviewer.com/hunspell-1.2.11-darwin.tar.gz</uri>
  14.309 +					</map>
  14.310 +				</map>
  14.311 +			</map>
  14.312 +			<key>otr</key>
  14.313 +			<map>
  14.314 +				<key>copyright</key>
  14.315 +				<string>various</string>
  14.316 +				<key>description</key>
  14.317 +				<string>A open source encryption library</string>
  14.318 +				<key>license</key>
  14.319 +				<string>lgpl</string>
  14.320 +				<key>packages</key>
  14.321 +				<map>
  14.322 +					<key>linux</key>
  14.323 +					<map>
  14.324 +						<key>md5sum</key>
  14.325 +						<string>84eef12ae4c4a303e83cf20c531e8fdf</string>
  14.326 +						<key>url</key>
  14.327 +						<uri>http://downloads.phoenixviewer.com/libotr-2.2.0-linux-20101018.tar.bz2</uri>
  14.328 +					</map>
  14.329 +					<key>darwin</key>
  14.330 +					<map>
  14.331 +						<key>md5sum</key>
  14.332 +						<string>6e68314811d65a2e0ef3e338e1084f39</string>
  14.333 +						<key>url</key>
  14.334 +						<uri>http://downloads.phoenixviewer.com/libotr-darwin.tar.bz2</uri>
  14.335 +					</map>
  14.336 +				</map>
  14.337 +			</map>
  14.338 +			<key>Growl</key>
  14.339 +			<map>
  14.340 +				<key>copyright</key>
  14.341 +				<string>The Growl Project</string>
  14.342 +				<key>description</key>
  14.343 +				<string>A unified notification system for Mac OS X</string>
  14.344 +				<key>license</key>
  14.345 +				<string>bsd</string>
  14.346 +				<key>packages</key>
  14.347 +				<map>
  14.348 +					<key>darwin</key>
  14.349 +					<map>
  14.350 +						<key>md5sum</key>
  14.351 +						<string>f075e96d8e1bfdd1f518829f0d7b74af</string>
  14.352 +						<key>url</key>
  14.353 +						<uri>http://downloads.phoenixviewer.com/growl-1.2.1-darwin.tar.gz</uri>
  14.354 +					</map>
  14.355 +					<key>windows</key>
  14.356 +					<map>
  14.357 +						<key>md5sum</key>
  14.358 +						<string>b017cc5f759eaeb862a8b94d43a39c04</string>
  14.359 +						<key>url</key>
  14.360 +						<uri>http://downloads.phoenixviewer.com/lggemwingrowllibraries.tar.bz2</uri>
  14.361 +					</map>
  14.362 +					<key>linux</key>
  14.363 +					<map>
  14.364 +						<key>md5sum</key>
  14.365 +						<string>af06208ec80b1f170cc560141602e2dc</string>
  14.366 +						<key>url</key>
  14.367 +						<uri>http://downloads.phoenixviewer.com/libnotify-0.4.4-linux-20101003.tar.bz2</uri>
  14.368 +					</map>
  14.369 +				</map>
  14.370 +			</map>
  14.371 +			<key>7zip</key>
  14.372 +			<map>
  14.373 +				<key>copyright</key>
  14.374 +				<string>Igor Pavlov</string>
  14.375 +				<key>license</key>
  14.376 +				<string>lgpl</string>
  14.377 +				<key>description</key>
  14.378 +				<string>7-Zip is a file archiver with the high compression ratio.</string>
  14.379 +				<key>packages</key>
  14.380 +				<map>
  14.381 +					<key>darwin</key>
  14.382 +					<map>
  14.383 +						<key>md5sum</key>
  14.384 +						<string>aa767999e0d405bdaed01fe3f7442dd9</string>
  14.385 +						<key>url</key>
  14.386 +						<uri>http://downloads.phoenixviewer.com/7zip-4.57-20100630.tar.bz2</uri>
  14.387 +					</map>
  14.388 +					<key>linux</key>
  14.389 +					<map>
  14.390 +						<key>md5sum</key>
  14.391 +						<string>a5a3c5f5d451a2bcaa8975dd349abf5a</string>
  14.392 +						<key>url</key>
  14.393 +						<uri>http://downloads.phoenixviewer.com/p7zip-standalone-linux-20100911.tar.bz2</uri>
  14.394 +					</map>
  14.395 +				</map>
  14.396 +			</map>
  14.397 +			<key>GL</key>
  14.398 +			<map>
  14.399 +				<key>copyright</key>
  14.400 +				<string>Copyright (c) 1991-2000 Silicon Graphics, Inc.</string>
  14.401 +				<key>description</key>
  14.402 +				<string>A standard for 3D Graphics rendering engine.</string>
  14.403 +				<key>license</key>
  14.404 +				<string>GL</string>
  14.405 +				<key>packages</key>
  14.406 +				<map>
  14.407 +					<key>darwin</key>
  14.408 +					<map>
  14.409 +						<key>md5sum</key>
  14.410 +						<string>0bd2795a2afe09f6c563f2f888f24cc9</string>
  14.411 +						<key>url</key>
  14.412 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-darwin-20080613.tar.bz2</uri>
  14.413 +					</map>
  14.414 +					<key>linux</key>
  14.415 +					<map>
  14.416 +						<key>md5sum</key>
  14.417 +						<string>2ab29212a7f3acdaebf10059af816be0</string>
  14.418 +						<key>url</key>
  14.419 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux-20080812.tar.bz2</uri>
  14.420 +					</map>
  14.421 +					<key>linux64</key>
  14.422 +					<map>
  14.423 +						<key>md5sum</key>
  14.424 +						<string>9c3dff3817f1105f9054401fdef1fe50</string>
  14.425 +						<key>url</key>
  14.426 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-linux64-20080909.tar.bz2</uri>
  14.427 +					</map>
  14.428 +					<key>windows</key>
  14.429 +					<map>
  14.430 +						<key>md5sum</key>
  14.431 +						<string>91155239b02f576384603795d41eb971</string>
  14.432 +						<key>url</key>
  14.433 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GL-windows-20090505.tar.bz2</uri>
  14.434 +					</map>
  14.435 +				</map>
  14.436 +			</map>
  14.437 +			<key>SDL</key>
  14.438 +			<map>
  14.439 +				<key>copyright</key>
  14.440 +				<string>Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga</string>
  14.441 +				<key>description</key>
  14.442 +				<string>The Simple DirectMedia Layer libraries are used for handling input and basic window/GL setup on the Linux client.</string>
  14.443 +				<key>license</key>
  14.444 +				<string>lgpl</string>
  14.445 +				<key>packages</key>
  14.446 +				<map>
  14.447 +					<key>darwin</key>
  14.448 +					<map>
  14.449 +						<key>md5sum</key>
  14.450 +						<string>7b07e7121a3623b2553ed36fb9024b40</string>
  14.451 +						<key>url</key>
  14.452 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-darwin-20080818.tar.bz2</uri>
  14.453 +					</map>
  14.454 +					<key>linux</key>
  14.455 +					<map>
  14.456 +						<key>md5sum</key>
  14.457 +						<string>25f8a8fc4ea94169fe6222571b8d5e55</string>
  14.458 +						<key>url</key>
  14.459 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.12-linux-20081222c.tar.bz2</uri>
  14.460 +					</map>
  14.461 +					<key>windows</key>
  14.462 +					<map>
  14.463 +						<key>md5sum</key>
  14.464 +						<string>149626b0c10d7eb8b9f9be96b5318218</string>
  14.465 +						<key>url</key>
  14.466 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-windows-20080613.tar.bz2</uri>
  14.467 +					</map>
  14.468 +				</map>
  14.469 +			</map>
  14.470 +			<key>apr_suite</key>
  14.471 +			<map>
  14.472 +				<key>license</key>
  14.473 +				<string>apache 2.0</string>
  14.474 +				<key>packages</key>
  14.475 +				<map>
  14.476 +					<key>darwin</key>
  14.477 +					<map>
  14.478 +						<key>md5sum</key>
  14.479 +						<string>115d8ac44a91efdb173e9b3e478c46b6</string>
  14.480 +						<key>url</key>
  14.481 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090805.tar.bz2</uri>
  14.482 +					</map>
  14.483 +					<key>linux</key>
  14.484 +					<map>
  14.485 +						<key>md5sum</key>
  14.486 +						<string>7b84cd6a3c601a104d9c09e58ef2f50c</string>
  14.487 +						<key>url</key>
  14.488 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux-20080812.tar.bz2</uri>
  14.489 +					</map>
  14.490 +					<key>linux64</key>
  14.491 +					<map>
  14.492 +						<key>md5sum</key>
  14.493 +						<string>1a7e1186855d48d8316ce86803095f70</string>
  14.494 +						<key>url</key>
  14.495 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux64-20080909a.tar.bz2</uri>
  14.496 +					</map>
  14.497 +					<key>windows</key>
  14.498 +					<map>
  14.499 +						<key>md5sum</key>
  14.500 +						<string>f4c8d035de4b09e7a3401d22c10e0ca3</string>
  14.501 +						<key>url</key>
  14.502 +						<uri>https://github.com/downloads/NickyPerian/imprudence/apr_suite-1.4.2-windows-20110217Imp.tar.bz2</uri>
  14.503 +					</map>
  14.504 +				</map>
  14.505 +			</map>
  14.506 +			<key>ares</key>
  14.507 +			<map>
  14.508 +				<key>copyright</key>
  14.509 +				<string>Copyright 1998 by the Massachusetts Institute of Technology.</string>
  14.510 +				<key>description</key>
  14.511 +				<string>Performs DNS requests and name resolves asynchronously. Used with libcurl to keep all HTTP operations async.</string>
  14.512 +				<key>license</key>
  14.513 +				<string>c-ares</string>
  14.514 +				<key>packages</key>
  14.515 +				<map>
  14.516 +					<key>darwin</key>
  14.517 +					<map>
  14.518 +						<key>md5sum</key>
  14.519 +						<string>d9ce3ace9235249b7edf6f564de83395</string>
  14.520 +						<key>url</key>
  14.521 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-darwin-20080731b.tar.bz2</uri>
  14.522 +					</map>
  14.523 +					<key>linux</key>
  14.524 +					<map>
  14.525 +						<key>md5sum</key>
  14.526 +            			<string>91694429e391efeea1de974df26032a2</string>
  14.527 +						<key>url</key>
  14.528 +            		<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-linux-20100527.tar.bz2</uri>
  14.529 +					</map>
  14.530 +					<key>linux64</key>
  14.531 +					<map>
  14.532 +						<key>md5sum</key>
  14.533 +						<string>c4242416e0b2e642c0bf062a19a250e4</string>
  14.534 +						<key>url</key>
  14.535 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.3.0-linux64-20080909.tar.bz2</uri>
  14.536 +					</map>
  14.537 +					<key>windows</key>
  14.538 +					<map>
  14.539 +						<key>md5sum</key>
  14.540 +						<string>f5cf8d121b26f2e7944f7e63cdbff04d</string>
  14.541 +						<key>url</key>
  14.542 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.6.0-windows-20091105.tar.bz2</uri>
  14.543 +					</map>
  14.544 +				</map>
  14.545 +			</map>
  14.546 +			<key>artwork-common</key>
  14.547 +			<map>
  14.548 +				<key>copyright</key>
  14.549 +				<string>(C) 2008 Linden Research, Inc.</string>
  14.550 +				<key>description</key>
  14.551 +				<string>Second Life(TM) Viewer Artwork</string>
  14.552 +				<key>license</key>
  14.553 +				<string>artwork</string>
  14.554 +				<key>packages</key>
  14.555 +				<map>
  14.556 +					<key>darwin</key>
  14.557 +					<map>
  14.558 +						<key>md5sum</key>
  14.559 +						<string>5e047437d73d1017bf270a6c6e936f23</string>
  14.560 +						<key>url</key>
  14.561 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090415.tar.bz2</uri>
  14.562 +					</map>
  14.563 +					<key>linux</key>
  14.564 +					<map>
  14.565 +						<key>md5sum</key>
  14.566 +						<string>5e047437d73d1017bf270a6c6e936f23</string>
  14.567 +						<key>url</key>
  14.568 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090415.tar.bz2</uri>
  14.569 +					</map>
  14.570 +					<key>windows</key>
  14.571 +					<map>
  14.572 +						<key>md5sum</key>
  14.573 +						<string>5e047437d73d1017bf270a6c6e936f23</string>
  14.574 +						<key>url</key>
  14.575 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090415.tar.bz2</uri>
  14.576 +					</map>
  14.577 +				</map>
  14.578 +			</map>
  14.579 +			<key>berkeley</key>
  14.580 +			<map>
  14.581 +				<key>copyright</key>
  14.582 +				<string>Copyright (c) 1990-1999 Sleepycat Software. All rights reserved.</string>
  14.583 +				<key>description</key>
  14.584 +				<string>a high-performance, embedded database library</string>
  14.585 +				<key>license</key>
  14.586 +				<string>sleepycat</string>
  14.587 +			</map>
  14.588 +			<key>boost</key>
  14.589 +			<map>
  14.590 +				<key>copyright</key>
  14.591 +				<string>various</string>
  14.592 +				<key>description</key>
  14.593 +				<string>A set of portable C++ libraries which provide a wide set of functionality. Used primarily for tokenization.</string>
  14.594 +				<key>license</key>
  14.595 +				<string>boost</string>
  14.596 +				<key>packages</key>
  14.597 +				<map>
  14.598 +					<key>darwin</key>
  14.599 +					<map>
  14.600 +						<key>md5sum</key>
  14.601 +						<string>51c98844053b718c40456bbe90d4fc51</string>
  14.602 +						<key>url</key>
  14.603 +						<uri>http://downloads.phoenixviewer.com/boost-1.41.0-darwin-20091229.tar.bz2</uri>
  14.604 +					</map>
  14.605 +					<key>linux</key>
  14.606 +					<map>
  14.607 +						<key>md5sum</key>
  14.608 +						<string>fff58f38257077f5668f9953145c0392</string>
  14.609 +						<key>url</key>
  14.610 +						<uri>http://downloads.phoenixviewer.com/boost-1.42.0-linux-20100911.tar.bz2</uri>
  14.611 +					</map>
  14.612 +					<key>windows</key>
  14.613 +					<map>
  14.614 +						<key>md5sum</key>
  14.615 +						<string>17f89b854959b4d728be832d9c8184e4</string>
  14.616 +						<key>url</key>
  14.617 +						<uri>https://github.com/downloads/NickyPerian/imprudence/boost_1_45_VC100_libs_inc_patch4073.tar.bz2</uri>
  14.618 +					</map>
  14.619 +				</map>
  14.620 +			</map>
  14.621 +			<key>curl</key>
  14.622 +			<map>
  14.623 +				<key>copyright</key>
  14.624 +				<string>Copyright (c) 1996 - 2008, Daniel Stenberg, &lt;daniel@haxx.se&gt;.</string>
  14.625 +				<key>description</key>
  14.626 +				<string>Client-side URL transfer library. Handles moving data across the net in many different protocols. Used to GET/POST/PUT/DELETE web resources.</string>
  14.627 +				<key>license</key>
  14.628 +				<string>curl</string>
  14.629 +				<key>packages</key>
  14.630 +				<map>
  14.631 +					<key>darwin</key>
  14.632 +					<map>
  14.633 +						<key>md5sum</key>
  14.634 +						<string>752e295ccb17f0dcb7c0167db3ad1e69</string>
  14.635 +						<key>url</key>
  14.636 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-darwin-20100606.tar.bz2</uri>
  14.637 +					</map>
  14.638 +					<key>linux</key>
  14.639 +					<map>
  14.640 +						<key>md5sum</key>
  14.641 +						<string>a20e73f2e7d6a032ff25a5161b1b7394</string>
  14.642 +						<key>url</key>
  14.643 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-linux-20100527.tar.bz2</uri>
  14.644 +					</map>
  14.645 +					<key>linux64</key>
  14.646 +					<map>
  14.647 +						<key>md5sum</key>
  14.648 +						<string>6994192cea7ab2d885a158a3de474273</string>
  14.649 +						<key>url</key>
  14.650 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.16.4a-linux64-20090303.tar.bz2</uri>
  14.651 +					</map>
  14.652 +					<key>windows</key>
  14.653 +					<map>
  14.654 +						<key>md5sum</key>
  14.655 +						<string>b28856d3d02ee680353ae440561a6579</string>
  14.656 +						<key>url</key>
  14.657 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20100611.tar.bz2</uri>
  14.658 +					</map>
  14.659 +				</map>
  14.660 +			</map>
  14.661 +			<key>dbghelp</key>
  14.662 +			<map>
  14.663 +				<key>copyright</key>
  14.664 +				<string>Copyright Microsoft Corporation</string>
  14.665 +				<key>description</key>
  14.666 +				<string>dbghelp: Debug helper from Microsoft Debugging Tools For Windows</string>
  14.667 +				<key>license</key>
  14.668 +				<string>MSDTW</string>
  14.669 +				<key>packages</key>
  14.670 +				<map>
  14.671 +					<key>windows</key>
  14.672 +					<map>
  14.673 +						<key>md5sum</key>
  14.674 +						<string>b7563064037e032143ca2d610aae5153</string>
  14.675 +						<key>url</key>
  14.676 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbghelp-6.11.1.404-windows-20090520.tar.bz2</uri>
  14.677 +					</map>
  14.678 +				</map>
  14.679 +			</map>
  14.680 +			<key>dbusglib</key>
  14.681 +			<map>
  14.682 +				<key>copyright</key>
  14.683 +				<string>Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.</string>
  14.684 +				<key>description</key>
  14.685 +				<string>dbus/dbus-glib headers and libs</string>
  14.686 +				<key>license</key>
  14.687 +				<string>AFL2.1</string>
  14.688 +				<key>packages</key>
  14.689 +				<map>
  14.690 +					<key>linux</key>
  14.691 +					<map>
  14.692 +						<key>md5sum</key>
  14.693 +						<string>5a3883730ee2ebd9d1853124b9346443</string>
  14.694 +						<key>url</key>
  14.695 +						<uri>http://downloads.phoenixviewer.com/libdbus-glib-0.76-linux-20101003.tar.bz2</uri>
  14.696 +					</map>
  14.697 +				</map>
  14.698 +			</map>
  14.699 +			<key>elfio</key>
  14.700 +			<map>
  14.701 +				<key>license</key>
  14.702 +				<string>lgpl</string>
  14.703 +				<key>packages</key>
  14.704 +				<map>
  14.705 +					<key>linux</key>
  14.706 +					<map>
  14.707 +						<key>md5sum</key>
  14.708 +						<string>82ea408af2f968cfe5f013ab241323ef</string>
  14.709 +						<key>url</key>
  14.710 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/elfio-1.0.3-linux-20080812.tar.bz2</uri>
  14.711 +					</map>
  14.712 +				</map>
  14.713 +			</map>
  14.714 +			<key>expat</key>
  14.715 +			<map>
  14.716 +				<key>copyright</key>
  14.717 +				<string>Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd</string>
  14.718 +				<key>description</key>
  14.719 +				<string>An XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags).</string>
  14.720 +				<key>license</key>
  14.721 +				<string>mit</string>
  14.722 +				<key>packages</key>
  14.723 +				<map>
  14.724 +					<key>darwin</key>
  14.725 +					<map>
  14.726 +						<key>md5sum</key>
  14.727 +						<string>c457a0a041ac4946265889a503d26c3d</string>
  14.728 +						<key>url</key>
  14.729 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20090805.tar.bz2</uri>
  14.730 +					</map>
  14.731 +					<key>linux</key>
  14.732 +					<map>
  14.733 +						<key>md5sum</key>
  14.734 +						<string>67b470fd446b08c9831d1039674eae4e</string>
  14.735 +						<key>url</key>
  14.736 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux-20080812.tar.bz2</uri>
  14.737 +					</map>
  14.738 +					<key>linux64</key>
  14.739 +					<map>
  14.740 +						<key>md5sum</key>
  14.741 +						<string>278c61871419b9a4d50a4f88b7922403</string>
  14.742 +						<key>url</key>
  14.743 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux64-20080909.tar.bz2</uri>
  14.744 +					</map>
  14.745 +					<key>windows</key>
  14.746 +					<map>
  14.747 +						<key>md5sum</key>
  14.748 +						<string>5dbbdb4a9b5bec86d180ef20a5f8ccfb</string>
  14.749 +						<key>url</key>
  14.750 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-windows-20090917.tar.bz2</uri>
  14.751 +					</map>
  14.752 +				</map>
  14.753 +			</map>
  14.754 +			<key>fmod</key>
  14.755 +			<map>
  14.756 +				<key>copyright</key>
  14.757 +				<string>FMOD Sound System, copyright (C) Firelight Technologies Pty, Ltd., 1994-2006.</string>
  14.758 +				<key>description</key>
  14.759 +				<string>Audio engine and mp3 stream decoder .</string>
  14.760 +				<key>license</key>
  14.761 +				<string>fmod</string>
  14.762 +				<key>packages</key>
  14.763 +				<map>
  14.764 +					<key>darwin</key>
  14.765 +					<map>
  14.766 +						<key>md5sum</key>
  14.767 +						<string>69011586de5725de08c10611b1a0289a</string>
  14.768 +						<key>url</key>
  14.769 +						<uri>http://www.fmod.org/files/fmod3/fmodapi375mac.zip</uri>
  14.770 +					</map>
  14.771 +					<key>linux</key>
  14.772 +					<map>
  14.773 +						<key>md5sum</key>
  14.774 +						<string>4fbd42fb8187c37ea454cc66186a1dfa</string>
  14.775 +						<key>url</key>
  14.776 +						<uri>http://www.fmod.org/files/fmod3/fmodapi375linux.tar.gz</uri>
  14.777 +					</map>
  14.778 +					<key>windows</key>
  14.779 +					<map>
  14.780 +						<key>md5sum</key>
  14.781 +						<string>4d28a685a92557c0dac06f9ab2567203</string>
  14.782 +						<key>url</key>
  14.783 +						<uri>http://www.fmod.org/files/fmod3/fmodapi375win.zip</uri>
  14.784 +					</map>
  14.785 +				</map>
  14.786 +			</map>
  14.787 +			<key>fontconfig</key>
  14.788 +			<map>
  14.789 +				<key>license</key>
  14.790 +				<string>mit</string>
  14.791 +				<key>packages</key>
  14.792 +				<map>
  14.793 +					<key>linux</key>
  14.794 +					<map>
  14.795 +						<key>md5sum</key>
  14.796 +						<string>9af6a1ed39fa540bfcaa402b0ea22f78</string>
  14.797 +						<key>url</key>
  14.798 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/fontconfig-2.2.3-linux-20080613.tar.bz2</uri>
  14.799 +					</map>
  14.800 +				</map>
  14.801 +			</map>
  14.802 +			<key>freeglut</key>
  14.803 +			<map>
  14.804 +				<key>license</key>
  14.805 +				<string>mit</string>
  14.806 +				<key>packages</key>
  14.807 +				<map>
  14.808 +					<key>windows</key>
  14.809 +					<map>
  14.810 +						<key>md5sum</key>
  14.811 +						<string>2d21dd5bb019f58a96b72acf6ee42ae2</string>
  14.812 +						<key>url</key>
  14.813 +						<uri>https://github.com/downloads/NickyPerian/imprudence/freeglut-2.6.0-windows-20110214Imp.tar.bz2</uri>
  14.814 +					</map>
  14.815 +				</map>
  14.816 +			</map>
  14.817 +			<key>freetype</key>
  14.818 +			<map>
  14.819 +				<key>copyright</key>
  14.820 +				<string>Copyright</string>
  14.821 +				<key>description</key>
  14.822 +				<string>Font</string>
  14.823 +				<key>license</key>
  14.824 +				<string>freetype</string>
  14.825 +				<key>packages</key>
  14.826 +				<map>
  14.827 +					<key>darwin</key>
  14.828 +					<map>
  14.829 +						<key>md5sum</key>
  14.830 +						<string>694173293a483c01472a30cc7d895c5a</string>
  14.831 +						<key>url</key>
  14.832 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-darwin-20080812.tar.bz2</uri>
  14.833 +					</map>
  14.834 +					<key>linux</key>
  14.835 +					<map>
  14.836 +						<key>md5sum</key>
  14.837 +						<string>eeffb03bd6672b6e7751448e5306d874</string>
  14.838 +						<key>url</key>
  14.839 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux-20081201.tar.bz2</uri>
  14.840 +					</map>
  14.841 +					<key>linux64</key>
  14.842 +					<map>
  14.843 +						<key>md5sum</key>
  14.844 +						<string>35f6fa557ba90f9cda0a18d1af2055a4</string>
  14.845 +						<key>url</key>
  14.846 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.1.5-linux64-20080909.tar.bz2</uri>
  14.847 +					</map>
  14.848 +					<key>windows</key>
  14.849 +					<map>
  14.850 +						<key>md5sum</key>
  14.851 +						<string>88980fd6d91ac541b62dea877ebe6ba6</string>
  14.852 +						<key>url</key>
  14.853 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-windows-20090917.tar.bz2</uri>
  14.854 +					</map>
  14.855 +				</map>
  14.856 +			</map>
  14.857 +			<key>glib</key>
  14.858 +			<map>
  14.859 +				<key>description</key>
  14.860 +				<string>GLib is a library containing many useful C routines for things such as trees, hashes, and lists.</string>
  14.861 +				<key>license</key>
  14.862 +				<string>gpl</string>
  14.863 +				<key>packages</key>
  14.864 +				<map>
  14.865 +					<key>darwin</key>
  14.866 +					<map>
  14.867 +						<key>md5sum</key>
  14.868 +						<string>64a131bae070964de6431e1c7d5e7362</string>
  14.869 +						<key>url</key>
  14.870 +						<uri>http://phoenixviewer.com/app/glib/glib-2.12.0-darwin-20091107.tar.bz2</uri>
  14.871 +					</map>
  14.872 +					<key>linux</key>
  14.873 +					<map>
  14.874 +						<key>md5sum</key>
  14.875 +						<string>566cc47a572303bc4aef12ca02670902</string>
  14.876 +						<key>url</key>
  14.877 +						<uri>http://phoenixviewer.com/app/glib/glib-2.20.5-linux32-20100529.tar.bz2</uri>
  14.878 +					</map>
  14.879            <key>linux64</key>
  14.880            <map>
  14.881              <key>md5sum</key>

mercurial