Merge

Tue, 28 Feb 2012 09:42:01 -0800

author
Tank_Master
date
Tue, 28 Feb 2012 09:42:01 -0800
changeset 1644
468bd5fd563d
parent 1625
d10f3caca2fe
parent 1643
3c9159b56866
child 1645
2a181eae8ed8

Merge

indra/newview/CMakeLists.txt file | annotate | diff | revisions
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/indra/build.bat	Tue Feb 28 09:42:01 2012 -0800
     1.3 @@ -0,0 +1,3 @@
     1.4 +@echo
     1.5 +msbuild build-vc100\Secondlife.sln /t:build /p:Configuration=Release /p:Platform=win32  2>&1 |c:\cygwin\bin\tee Build.log
     1.6 +::msbuild build-vc100\newview\package.vcxproj /t:build /p:Configuration=RelWithDebInfo /p:Platform=win32  /p:"VCBuildAdditionalOptions= /useenv" /p:"VCBuildAdditionalOptions= /incremental" 2>&1 |c:\cygwin\bin\tee Buildpackage.log
     1.7 \ No newline at end of file
     2.1 --- a/indra/cmake/00-Common.cmake	Tue Feb 28 02:08:17 2012 -0800
     2.2 +++ b/indra/cmake/00-Common.cmake	Tue Feb 28 09:42:01 2012 -0800
     2.3 @@ -80,7 +80,7 @@
     2.4        /arch:SSE2
     2.5        )
     2.6       
     2.7 -  if(MSVC80 OR MSVC90)
     2.8 +  if(MSVC80 OR MSVC90 OR MSVC10)
     2.9      set(CMAKE_CXX_FLAGS_RELEASE
    2.10        "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
    2.11        CACHE STRING "C++ compiler release options" FORCE)
    2.12 @@ -88,7 +88,7 @@
    2.13      add_definitions(
    2.14        /Zc:wchar_t-
    2.15        )
    2.16 -  endif (MSVC80 OR MSVC90)
    2.17 +  endif (MSVC80 OR MSVC90 OR MSVC10)
    2.18    
    2.19    # Are we using the crummy Visual Studio KDU build workaround?
    2.20    if (NOT VS_DISABLE_FATAL_WARNINGS)
    2.21 @@ -107,7 +107,16 @@
    2.22      elseif (MSVC90)
    2.23  	    set(MSVC_DIR 9.0)
    2.24  	    set(MSVC_SUFFIX 90)
    2.25 +    elseif (MSVC10)
    2.26 +	    set(MSVC_DIR 10.0)
    2.27 +	    set(MSVC_SUFFIX 100)
    2.28      endif (MSVC71)
    2.29 +
    2.30 +if (MSVC10)
    2.31 +    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
    2.32 +    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO")
    2.33 +    SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
    2.34 +  endif(MSVC10)
    2.35      
    2.36  endif (WINDOWS)
    2.37  
     3.1 --- a/indra/cmake/Boost.cmake	Tue Feb 28 02:08:17 2012 -0800
     3.2 +++ b/indra/cmake/Boost.cmake	Tue Feb 28 09:42:01 2012 -0800
     3.3 @@ -11,7 +11,7 @@
     3.4    set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
     3.5  
     3.6    if (WINDOWS)
     3.7 -    set(BOOST_VERSION 1_43)
     3.8 +    set(BOOST_VERSION 1_45)
     3.9      if (MSVC80)
    3.10        set(Boost_PROGRAM_OPTIONS_LIBRARY 
    3.11            optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
    3.12 @@ -25,13 +25,7 @@
    3.13        set(Boost_WAVE_LIBRARY 
    3.14            optimized libboost_wave-vc80-mt-${BOOST_VERSION}
    3.15            debug libboost_wave-vc80-mt-gd-${BOOST_VERSION})
    3.16 -      set(Boost_SYSTEM_LIBRARY 
    3.17 -          optimized libboost_system-vc80-mt-${BOOST_VERSION}
    3.18 -          debug libboost_system-vc80-mt-gd-${BOOST_VERSION})
    3.19 -      set(Boost_FILESYSTEM_LIBRARY 
    3.20 -          optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
    3.21 -          debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
    3.22 -	  else (MSVC90)
    3.23 +    elseif (MSVC90)
    3.24        set(Boost_PROGRAM_OPTIONS_LIBRARY 
    3.25            optimized libboost_program_options-vc90-mt-${BOOST_VERSION}
    3.26            debug libboost_program_options-vc90-mt-gd-${BOOST_VERSION})
    3.27 @@ -44,18 +38,25 @@
    3.28        set(Boost_WAVE_LIBRARY 
    3.29            optimized libboost_wave-vc90-mt-${BOOST_VERSION}
    3.30            debug libboost_wave-vc90-mt-gd-${BOOST_VERSION})
    3.31 -      set(Boost_SYSTEM_LIBRARY 
    3.32 -          optimized libboost_system-vc90-mt-${BOOST_VERSION}
    3.33 -          debug libboost_system-vc90-mt-gd-${BOOST_VERSION})
    3.34 -      set(Boost_FILESYSTEM_LIBRARY 
    3.35 -          optimized libboost_filesystem-vc90-mt-${BOOST_VERSION}
    3.36 -          debug libboost_filesystem-vc90-mt-gd-${BOOST_VERSION})
    3.37 +    elseif (MSVC10)
    3.38 +      set(Boost_PROGRAM_OPTIONS_LIBRARY 
    3.39 +          optimized libboost_program_options-vc100-mt-${BOOST_VERSION}
    3.40 +          debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION})
    3.41 +      set(Boost_REGEX_LIBRARY
    3.42 +          optimized libboost_regex-vc100-mt-${BOOST_VERSION}
    3.43 +          debug libboost_regex-vc100-mt-gd-${BOOST_VERSION})
    3.44 +      set(Boost_SIGNALS_LIBRARY 
    3.45 +          optimized libboost_signals-vc100-mt-${BOOST_VERSION}
    3.46 +          debug libboost_signals-vc100-mt-gd-${BOOST_VERSION})
    3.47 +      set(Boost_WAVE_LIBRARY 
    3.48 +          optimized libboost_wave-vc100-mt-${BOOST_VERSION}
    3.49 +          debug libboost_wave-vc100-mt-gd-${BOOST_VERSION})
    3.50      endif (MSVC80)
    3.51    elseif (LINUX)
    3.52    	set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)  	
    3.53    	set(Boost_REGEX_LIBRARY boost_regex-mt)
    3.54    	set(Boost_PYTHON_LIBRARY boost_python-mt)
    3.55 -#  	set(Boost_SIGNALS_LIBRARY boost_signals-mt)
    3.56 +  	set(Boost_SIGNALS_LIBRARY boost_signals-mt)
    3.57    	set(Boost_WAVE_LIBRARY boost_wave-mt)
    3.58    	set(Boost_SYSTEM_LIBRARY boost_system-mt)
    3.59    	set(Boost_FILESYSTEM_LIBRARY boost_filesystem-mt)
    3.60 @@ -66,7 +67,7 @@
    3.61    	set(Boost_PROGRAM_OPTIONS_LIBRARY boost_program_options)  	
    3.62    	set(Boost_REGEX_LIBRARY boost_regex)
    3.63    	set(Boost_PYTHON_LIBRARY boost_python)
    3.64 -#  	set(Boost_SIGNALS_LIBRARY boost_signals)
    3.65 +  	set(Boost_SIGNALS_LIBRARY boost_signals)
    3.66    	set(Boost_WAVE_LIBRARY boost_wave)
    3.67    	set(Boost_SYSTEM_LIBRARY boost_system)
    3.68    	set(Boost_FILESYSTEM_LIBRARY boost_filesystem)
     4.1 --- a/indra/cmake/CopyWinLibs.cmake	Tue Feb 28 02:08:17 2012 -0800
     4.2 +++ b/indra/cmake/CopyWinLibs.cmake	Tue Feb 28 09:42:01 2012 -0800
     4.3 @@ -5,6 +5,20 @@
     4.4  # VisualStudio. 
     4.5  
     4.6  include(CMakeCopyIfDifferent)
     4.7 +# Provide compiler version awareness
     4.8 +   if (MSVC71)
     4.9 +        set(MSVC_DIR 7.1)
    4.10 +        set(MSVC_SUFFIX 71)
    4.11 +    elseif (MSVC80)
    4.12 +        set(MSVC_DIR 8.0)
    4.13 +        set(MSVC_SUFFIX 80)
    4.14 +    elseif (MSVC90)
    4.15 +        set(MSVC_DIR 9.0)
    4.16 +        set(MSVC_SUFFIX 90)
    4.17 +    elseif (MSVC10)
    4.18 +        set(MSVC_DIR 10.0)
    4.19 +        set(MSVC_SUFFIX 100)
    4.20 +    endif (MSVC71)
    4.21  
    4.22  set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
    4.23  set(vivox_files
    4.24 @@ -335,105 +349,6 @@
    4.25     
    4.26  endif (EXISTS ${internal_llkdu_path})
    4.27  
    4.28 -# Copy MS C runtime dlls, required for packaging.
    4.29 -# *TODO - Adapt this to support VC9
    4.30 -if (MSVC80)
    4.31 -    FIND_PATH(debug_msvc8_redist_path msvcr80d.dll
    4.32 -        PATHS
    4.33 -         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT
    4.34 -        NO_DEFAULT_PATH
    4.35 -        NO_DEFAULT_PATH
    4.36 -        )
    4.37 -
    4.38 -    if(EXISTS ${debug_msvc8_redist_path})
    4.39 -        set(debug_msvc8_files
    4.40 -            msvcr80d.dll
    4.41 -            msvcp80d.dll
    4.42 -            Microsoft.VC80.DebugCRT.manifest
    4.43 -            )
    4.44 -
    4.45 -        copy_if_different(
    4.46 -            ${debug_msvc8_redist_path} 
    4.47 -            "${CMAKE_CURRENT_BINARY_DIR}/Debug"
    4.48 -            out_targets 
    4.49 -            ${debug_msvc8_files}
    4.50 -            )
    4.51 -        set(all_targets ${all_targets} ${out_targets})
    4.52 -
    4.53 -        set(debug_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Debug/secondlife-bin.exe.config)
    4.54 -        add_custom_command(
    4.55 -            OUTPUT ${debug_appconfig_file}
    4.56 -            COMMAND ${PYTHON_EXECUTABLE}
    4.57 -            ARGS
    4.58 -              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
    4.59 -              ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
    4.60 -              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLifeDebug.exe.config
    4.61 -              ${debug_appconfig_file}
    4.62 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest
    4.63 -            COMMENT "Creating debug app config file"
    4.64 -            )
    4.65 -
    4.66 -    endif (EXISTS ${debug_msvc8_redist_path})
    4.67 -
    4.68 -    FIND_PATH(release_msvc8_redist_path msvcr80.dll
    4.69 -        PATHS
    4.70 -         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC80.CRT
    4.71 -        NO_DEFAULT_PATH
    4.72 -        NO_DEFAULT_PATH
    4.73 -        )
    4.74 -
    4.75 -    if(EXISTS ${release_msvc8_redist_path})
    4.76 -        set(release_msvc8_files
    4.77 -            msvcr80.dll
    4.78 -            msvcp80.dll
    4.79 -            Microsoft.VC80.CRT.manifest
    4.80 -            )
    4.81 -
    4.82 -        copy_if_different(
    4.83 -            ${release_msvc8_redist_path} 
    4.84 -            "${CMAKE_CURRENT_BINARY_DIR}/Release"
    4.85 -            out_targets 
    4.86 -            ${release_msvc8_files}
    4.87 -            )
    4.88 -        set(all_targets ${all_targets} ${out_targets})
    4.89 -
    4.90 -        copy_if_different(
    4.91 -            ${release_msvc8_redist_path} 
    4.92 -            "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
    4.93 -            out_targets 
    4.94 -            ${release_msvc8_files}
    4.95 -            )
    4.96 -        set(all_targets ${all_targets} ${out_targets})
    4.97 -
    4.98 -        set(release_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/secondlife-bin.exe.config)
    4.99 -        add_custom_command(
   4.100 -            OUTPUT ${release_appconfig_file}
   4.101 -            COMMAND ${PYTHON_EXECUTABLE}
   4.102 -            ARGS
   4.103 -              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
   4.104 -              ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
   4.105 -              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
   4.106 -              ${release_appconfig_file}
   4.107 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest
   4.108 -            COMMENT "Creating release app config file"
   4.109 -            )
   4.110 -
   4.111 -        set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/secondlife-bin.exe.config)
   4.112 -        add_custom_command(
   4.113 -            OUTPUT ${relwithdebinfo_appconfig_file}
   4.114 -            COMMAND ${PYTHON_EXECUTABLE}
   4.115 -            ARGS
   4.116 -              ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py
   4.117 -              ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
   4.118 -              ${CMAKE_CURRENT_SOURCE_DIR}/SecondLife.exe.config
   4.119 -              ${relwithdebinfo_appconfig_file}
   4.120 -            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest
   4.121 -            COMMENT "Creating relwithdebinfo app config file"
   4.122 -            )
   4.123 -          
   4.124 -    endif (EXISTS ${release_msvc8_redist_path})
   4.125 -endif (MSVC80)
   4.126 -
   4.127  add_custom_target(copy_win_libs ALL
   4.128    DEPENDS 
   4.129      ${all_targets}
     5.1 --- a/indra/cmake/JsonCpp.cmake	Tue Feb 28 02:08:17 2012 -0800
     5.2 +++ b/indra/cmake/JsonCpp.cmake	Tue Feb 28 09:42:01 2012 -0800
     5.3 @@ -18,6 +18,10 @@
     5.4        set(JSONCPP_LIBRARIES 
     5.5          debug json_vc90d
     5.6          optimized json_vc90)
     5.7 +    elseif (MSVC10)
     5.8 +      set(JSONCPP_LIBRARIES 
     5.9 +        debug json_vc10d
    5.10 +        optimized json_vc10)
    5.11  	endif(MSVC80)
    5.12    elseif (DARWIN)
    5.13      set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
     6.1 --- a/indra/cmake/QuickTimePlugin.cmake	Tue Feb 28 02:08:17 2012 -0800
     6.2 +++ b/indra/cmake/QuickTimePlugin.cmake	Tue Feb 28 09:42:01 2012 -0800
     6.3 @@ -1,46 +1,56 @@
     6.4  # -*- cmake -*-
     6.5 +if(INSTALL_PROPRIETARY OR USE_QUICKTIME)
     6.6 +  set(QUICKTIME ON CACHE BOOL "Build with Quicktime support")
     6.7 +endif(INSTALL_PROPRIETARY OR USE_QUICKTIME)
     6.8  
     6.9 -if(INSTALL_PROPRIETARY)
    6.10 +if(QUICKTIME)
    6.11 +
    6.12    include(Prebuilt)
    6.13    use_prebuilt_binary(quicktime)
    6.14 -endif(INSTALL_PROPRIETARY)
    6.15  
    6.16 -if (DARWIN)
    6.17 -  include(CMakeFindFrameworks)
    6.18 -  find_library(QUICKTIME_LIBRARY QuickTime)
    6.19 -elseif (WINDOWS)
    6.20 -  set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
    6.21 +
    6.22 +  if (DARWIN)
    6.23 +    include(CMakeFindFrameworks)
    6.24 +    find_library(QUICKTIME_LIBRARY QuickTime)
    6.25 +  elseif (WINDOWS)
    6.26 +    if ("$ENV(QUICKTIME_SDK_DIR")
    6.27 +      set(QUICKTIME_SDK_DIR "$ENV(QUICKTIME_SDK_DIR)"
    6.28 +           CACHE PATH "Location of the QuickTime SDK.")
    6.29 +    else ()#APPLE LOCAL SDK
    6.30 +      set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
    6.31        CACHE PATH "Location of the QuickTime SDK.")
    6.32 +    endif ()
    6.33  
    6.34 -  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient.lib
    6.35 -               PATHS
    6.36 -               ${ARCH_PREBUILT_DIRS_DEBUG}
    6.37 -               "${QUICKTIME_SDK_DIR}\\libraries"
    6.38 -               )
    6.39 +    find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient.lib
    6.40 +           PATHS
    6.41 +           ${ARCH_PREBUILT_DIRS_DEBUG}
    6.42 +           "${QUICKTIME_SDK_DIR}\\libraries"
    6.43 +           )
    6.44  
    6.45 -  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient.lib
    6.46 -               PATHS
    6.47 -               ${ARCH_PREBUILT_DIRS_RELEASE}
    6.48 -               "${QUICKTIME_SDK_DIR}\\libraries"
    6.49 -               )
    6.50 +    find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient.lib
    6.51 +           PATHS
    6.52 +           ${ARCH_PREBUILT_DIRS_RELEASE}
    6.53 +           "${QUICKTIME_SDK_DIR}\\libraries"
    6.54 +           )
    6.55  
    6.56 -  if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
    6.57 +    if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
    6.58      set(QUICKTIME_LIBRARY 
    6.59 -        optimized ${RELEASE_QUICKTIME_LIBRARY}
    6.60 -        debug ${DEBUG_QUICKTIME_LIBRARY}
    6.61 -        )
    6.62 -        
    6.63 -  endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
    6.64 -  
    6.65 -  include_directories(
    6.66 -    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
    6.67 +      optimized ${RELEASE_QUICKTIME_LIBRARY}
    6.68 +      debug ${DEBUG_QUICKTIME_LIBRARY}
    6.69 +      )
    6.70 +      
    6.71 +    endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
    6.72 +    
    6.73 +    include_directories(
    6.74 +    ${LIBS_PREBUILT_DIR}/include/quicktime
    6.75      "${QUICKTIME_SDK_DIR}\\CIncludes"
    6.76      )
    6.77 -endif (DARWIN)
    6.78 +  endif (DARWIN)
    6.79  
    6.80 -mark_as_advanced(QUICKTIME_LIBRARY)
    6.81 +  mark_as_advanced(QUICKTIME_LIBRARY)
    6.82  
    6.83 -if (QUICKTIME_LIBRARY)
    6.84 -  set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
    6.85 -endif (QUICKTIME_LIBRARY)
    6.86 +  if (QUICKTIME_LIBRARY)
    6.87 +    set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
    6.88 +  endif (QUICKTIME_LIBRARY)
    6.89 +endif(QUICKTIME)
    6.90  
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/indra/config.bat	Tue Feb 28 09:42:01 2012 -0800
     7.3 @@ -0,0 +1,4 @@
     7.4 +@echo
     7.5 +set lib=%lib%
     7.6 +set include=%include%
     7.7 +python develop.py -G vc100 -tRelease configure -DLAA:BOOL=ON -DUSE_PRECOMPILED_HEADERS:BOOL=ON -DLL_TESTS=OFF -DPACKAGE:BOOL=OFF  2>&1 |c:\cygwin\bin\tee Config.log
     7.8 \ No newline at end of file
     8.1 --- a/indra/develop.py	Tue Feb 28 02:08:17 2012 -0800
     8.2 +++ b/indra/develop.py	Tue Feb 28 09:42:01 2012 -0800
     8.3 @@ -481,11 +481,16 @@
     8.4          'vc90' : {
     8.5              'gen' : r'Visual Studio 9 2008',
     8.6              'ver' : r'9.0'
     8.7 +            },
     8.8 +        'vc100' : {
     8.9 +            'gen' : r'Visual Studio 10',
    8.10 +            'ver' : r'10.0'
    8.11              }
    8.12          }
    8.13      gens['vs2003'] = gens['vc71']
    8.14      gens['vs2005'] = gens['vc80']
    8.15      gens['vs2008'] = gens['vc90']
    8.16 +    gens['vs2010'] = gens['vc100']
    8.17  
    8.18      search_path = r'C:\windows'
    8.19      exe_suffixes = ('.exe', '.bat', '.com')
    8.20 @@ -497,14 +502,14 @@
    8.21  
    8.22      def _get_generator(self):
    8.23          if self._generator is None:
    8.24 -            for version in 'vc80 vc90 vc71'.split():
    8.25 +            for version in 'vc80 vc90 vc100 vc71'.split():
    8.26                  if self.find_visual_studio(version):
    8.27                      self._generator = version
    8.28                      print 'Building with ', self.gens[version]['gen']
    8.29                      break
    8.30              else:
    8.31                      print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
    8.32 -                    for version in 'vc80 vc90 vc71'.split():
    8.33 +                    for version in 'vc80 vc90 vc100 vc71'.split():
    8.34                          if self.find_visual_studio_express(version):
    8.35                              self._generator = version
    8.36                              self.using_express = True
    8.37 @@ -598,7 +603,7 @@
    8.38      def get_build_cmd(self):
    8.39          if self.incredibuild:
    8.40              config = self.build_type
    8.41 -            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:
    8.42 +            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0' ]:
    8.43                  config = '\"%s|Win32\"' % config
    8.44  
    8.45              return "buildconsole %s.sln /build %s" % (self.project_name, config)
    8.46 @@ -723,8 +728,8 @@
    8.47    -m32 | -m64           build architecture (32-bit or 64-bit)
    8.48    -N | --no-distcc      disable use of distcc
    8.49    -G | --generator=NAME generator name
    8.50 -                        Windows: VC71 or VS2003 (default), VC80 (VS2005) or 
    8.51 -                          VC90 (VS2008)
    8.52 +                        Windows: VC71 or VS2003, VC80 (VS2005) (default)  
    8.53 +                          VC90 (VS2008), or VC100 (VS2010)
    8.54                          Mac OS X: Xcode (default), Unix Makefiles
    8.55                          Linux: Unix Makefiles (default), KDevelop3
    8.56    -p | --project=NAME   set the root project name. (Doesn't effect makefiles)
     9.1 --- a/indra/llaudio/llaudiodecodemgr.h	Tue Feb 28 02:08:17 2012 -0800
     9.2 +++ b/indra/llaudio/llaudiodecodemgr.h	Tue Feb 28 09:42:01 2012 -0800
     9.3 @@ -39,6 +39,7 @@
     9.4  
     9.5  #include "llassettype.h"
     9.6  #include "llframetimer.h"
     9.7 +#include <iterator> 
     9.8  
     9.9  class LLVFS;
    9.10  class LLVorbisDecodeState;
    10.1 --- a/indra/llcommon/llstring.cpp	Tue Feb 28 02:08:17 2012 -0800
    10.2 +++ b/indra/llcommon/llstring.cpp	Tue Feb 28 09:42:01 2012 -0800
    10.3 @@ -179,10 +179,10 @@
    10.4  	return outchars - base;
    10.5  }	
    10.6  
    10.7 -S32 utf16chars_to_wchar(const U16* inchars, llwchar* outchar)
    10.8 +S32 utf16chars_to_wchar(const wchar_t* inchars, llwchar* outchar)
    10.9  {
   10.10 -	const U16* base = inchars;
   10.11 -	U16 cur_char = *inchars++;
   10.12 +	const wchar_t* base = inchars;
   10.13 +	wchar_t cur_char = *inchars++;
   10.14  	llwchar char32 = cur_char;
   10.15  	if ((cur_char >= 0xD800) && (cur_char <= 0xDFFF))
   10.16  	{
   10.17 @@ -241,7 +241,7 @@
   10.18  
   10.19  	S32 i = 0;
   10.20  	// craziness to make gcc happy (llutf16string.c_str() is tweaked on linux):
   10.21 -	const U16* chars16 = &(*(utf16str.begin()));
   10.22 +	const wchar_t* chars16 = &(*(utf16str.begin()));
   10.23  	while (i < len)
   10.24  	{
   10.25  		llwchar cur_char;
   10.26 @@ -262,18 +262,18 @@
   10.27  {
   10.28  	S32 surrogate_pairs = 0;
   10.29  	// ... craziness to make gcc happy (llutf16string.c_str() is tweaked on linux):
   10.30 -	const U16 *const utf16_chars = &(*(utf16str.begin()));
   10.31 +	const wchar_t *const utf16_chars = &(*(utf16str.begin()));
   10.32  	S32 i = 0;
   10.33  	while (i < utf16_len)
   10.34  	{
   10.35 -		const U16 c = utf16_chars[i++];
   10.36 +		const wchar_t c = utf16_chars[i++];
   10.37  		if (c >= 0xD800 && c <= 0xDBFF)		// See http://en.wikipedia.org/wiki/UTF-16
   10.38  		{   // Have first byte of a surrogate pair
   10.39  			if (i >= utf16_len)
   10.40  			{
   10.41  				break;
   10.42  			}
   10.43 -			const U16 d = utf16_chars[i];
   10.44 +			const wchar_t d = utf16_chars[i];
   10.45  			if (d >= 0xDC00 && d <= 0xDFFF)
   10.46  			{   // Have valid second byte of a surrogate pair
   10.47  				surrogate_pairs++;
    11.1 --- a/indra/llcommon/llstring.h	Tue Feb 28 02:08:17 2012 -0800
    11.2 +++ b/indra/llcommon/llstring.h	Tue Feb 28 09:42:01 2012 -0800
    11.3 @@ -448,7 +448,7 @@
    11.4  //
    11.5  // We should never use UTF16 except when communicating with Win32!
    11.6  //
    11.7 -typedef std::basic_string<U16> llutf16string;
    11.8 +typedef std::basic_string<wchar_t> llutf16string;
    11.9  
   11.10  LL_COMMON_API LLWString utf16str_to_wstring(const llutf16string &utf16str, S32 len);
   11.11  LL_COMMON_API LLWString utf16str_to_wstring(const llutf16string &utf16str);
    12.1 --- a/indra/llmessage/llbuffer.h	Tue Feb 28 02:08:17 2012 -0800
    12.2 +++ b/indra/llmessage/llbuffer.h	Tue Feb 28 09:42:01 2012 -0800
    12.3 @@ -44,7 +44,7 @@
    12.4  
    12.5  #include <list>
    12.6  #include <vector>
    12.7 -
    12.8 +#include <iterator>
    12.9  /** 
   12.10   * @class LLChannelDescriptors
   12.11   * @brief A way simple interface to accesss channels inside a buffer
    13.1 --- a/indra/newview/CMakeLists.txt	Tue Feb 28 02:08:17 2012 -0800
    13.2 +++ b/indra/newview/CMakeLists.txt	Tue Feb 28 09:42:01 2012 -0800
    13.3 @@ -1391,10 +1391,13 @@
    13.4  
    13.5  if (WINDOWS)
    13.6      if(MSVC71)
    13.7 -        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES")
    13.8 +        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES /LARGEADDRESSAWARE")
    13.9      else(MSVC71)
   13.10 -        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
   13.11 +        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /LARGEADDRESSAWARE")
   13.12      endif(MSVC71)
   13.13 +    if (MSVC10) 
   13.14 +        set(release_flags "/MAPRelease/${VIEWER_BINARY_NAME}.map /LARGEADDRESSAWARE") 
   13.15 +    endif(MSVC10) 
   13.16      
   13.17      set_target_properties(${VIEWER_BINARY_NAME}
   13.18          PROPERTIES
   13.19 @@ -1404,19 +1407,19 @@
   13.20          )
   13.21  
   13.22      # sets the 'working directory' for debugging from visual studio.
   13.23 -    if (NOT UNATTENDED)
   13.24 -        add_custom_command(
   13.25 -            TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
   13.26 -            COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
   13.27 -            ARGS
   13.28 -              --solution 
   13.29 -              ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
   13.30 -              --workingdir
   13.31 -              ${VIEWER_BINARY_NAME}
   13.32 -              ${CMAKE_CURRENT_SOURCE_DIR}
   13.33 -            COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
   13.34 -            )
   13.35 -    endif (NOT UNATTENDED)
   13.36 +    #if (NOT UNATTENDED)
   13.37 +    #    add_custom_command(
   13.38 +    #        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
   13.39 +    #        COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
   13.40 +    #        ARGS
   13.41 +    #          --solution 
   13.42 +    #          ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
   13.43 +    #          --workingdir
   13.44 +    #          ${VIEWER_BINARY_NAME}
   13.45 +    #          ${CMAKE_CURRENT_SOURCE_DIR}
   13.46 +    #        COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
   13.47 +    #        )
   13.48 +    #endif (NOT UNATTENDED)
   13.49  
   13.50      add_custom_command(
   13.51          TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
    14.1 --- a/indra/newview/viewer_manifest.py	Tue Feb 28 02:08:17 2012 -0800
    14.2 +++ b/indra/newview/viewer_manifest.py	Tue Feb 28 09:42:01 2012 -0800
    14.3 @@ -279,13 +279,13 @@
    14.4                  # These need to be installed as a SxS assembly, currently a 'private' assembly.
    14.5                  # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
    14.6                  if self.args['configuration'].lower() == 'debug':
    14.7 -                    self.path("msvcr80d.dll")
    14.8 -                    self.path("msvcp80d.dll")
    14.9 -                    self.path("Microsoft.VC80.DebugCRT.manifest")
   14.10 +                    self.path("msvcr100d.dll")
   14.11 +                    self.path("msvcp100d.dll")
   14.12 +                    self.path("Microsoft.VC100.DebugCRT.manifest")
   14.13                  else:
   14.14 -                    self.path("msvcr80.dll")
   14.15 -                    self.path("msvcp80.dll")
   14.16 -                    self.path("Microsoft.VC80.CRT.manifest")
   14.17 +                    self.path("msvcr100.dll")
   14.18 +                    self.path("msvcp100.dll")
   14.19 +                    self.path("Microsoft.VC100.CRT.manifest")
   14.20              except RuntimeError:
   14.21                  print "WARNING: not copying VC runtimes to staging area, this will fail if you make an installer from this staging"
   14.22  
    15.1 Binary file indra/tools/vstool/VSTool.exe has changed
    16.1 --- a/indra/tools/vstool/main.cs	Tue Feb 28 02:08:17 2012 -0800
    16.2 +++ b/indra/tools/vstool/main.cs	Tue Feb 28 09:42:01 2012 -0800
    16.3 @@ -550,6 +550,10 @@
    16.4                      case "10.00":
    16.5                          version = "VC90";
    16.6                          break;
    16.7 +
    16.8 +                    case "11.00":
    16.9 +                        version = "VC100";
   16.10 +                        break;
   16.11                      default:
   16.12                          throw new ApplicationException("Unknown .sln version: " + format);
   16.13                  }
   16.14 @@ -585,6 +589,10 @@
   16.15                  case "VC90":
   16.16                      progid = "VisualStudio.DTE.9.0";
   16.17                      break;
   16.18 +
   16.19 +                case "VC100":
   16.20 +                    progid = "VisualStudio.DTE.10.0";
   16.21 +                    break;
   16.22                  default:
   16.23                      throw new ApplicationException("Can't handle VS version: " + version);
   16.24              }
    17.1 --- a/install.xml	Tue Feb 28 02:08:17 2012 -0800
    17.2 +++ b/install.xml	Tue Feb 28 09:42:01 2012 -0800
    17.3 @@ -207,9 +207,9 @@
    17.4            <key>windows</key>
    17.5            <map>
    17.6              <key>md5sum</key>
    17.7 -            <string>5334e46f65edf330ee892a6aeab8cf24</string>
    17.8 -            <key>url</key>
    17.9 -            <uri>http://phoenixviewer.com/app/packages/growl-ph-windows-20111204.tar.bz2</uri>
   17.10 +						<string>f6711ce5745723060a97ce309f90a1cb</string>
   17.11 +						<key>url</key>
   17.12 +						<uri>http://dl.dropbox.com/u/43361170/wingrowllibraries.tar.bz2</uri>
   17.13            </map>
   17.14            <key>linux</key>
   17.15            <map>
   17.16 @@ -349,28 +349,28 @@
   17.17            <key>windows</key>
   17.18            <map>
   17.19              <key>md5sum</key>
   17.20 -            <string>a02619c1e30a3db02d3883bf1ad7a1e6</string>
   17.21 -            <key>url</key>
   17.22 -            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.8-windows-20090911.tar.bz2</uri>
   17.23 -          </map>
   17.24 -        </map>
   17.25 -      </map>
   17.26 -      <key>ares</key>
   17.27 -      <map>
   17.28 -        <key>copyright</key>
   17.29 -        <string>Copyright 1998 by the Massachusetts Institute of Technology.</string>
   17.30 -        <key>description</key>
   17.31 -        <string>Performs DNS requests and name resolves asynchronously. Used with libcurl to keep all HTTP operations async.</string>
   17.32 -        <key>license</key>
   17.33 -        <string>c-ares</string>
   17.34 -        <key>packages</key>
   17.35 -        <map>
   17.36 -          <key>darwin</key>
   17.37 -          <map>
   17.38 -            <key>md5sum</key>
   17.39 -            <string>cdb2f5c4a5a1f9ecd75bc1dbdd4db8e9</string>
   17.40 -            <key>url</key>
   17.41 -            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20100606.tar.bz2</uri>
   17.42 +						<string>f4c8d035de4b09e7a3401d22c10e0ca3</string>
   17.43 +						<key>url</key>
   17.44 +						<uri>https://github.com/downloads/NickyPerian/imprudence/apr_suite-1.4.2-windows-20110217Imp.tar.bz2</uri>
   17.45 +					</map>
   17.46 +				</map>
   17.47 +			</map>
   17.48 +			<key>ares</key>
   17.49 +			<map>
   17.50 +				<key>copyright</key>
   17.51 +				<string>Copyright 1998 by the Massachusetts Institute of Technology.</string>
   17.52 +				<key>description</key>
   17.53 +				<string>Performs DNS requests and name resolves asynchronously. Used with libcurl to keep all HTTP operations async.</string>
   17.54 +				<key>license</key>
   17.55 +				<string>c-ares</string>
   17.56 +				<key>packages</key>
   17.57 +				<map>
   17.58 +					<key>darwin</key>
   17.59 +					<map>
   17.60 +						<key>md5sum</key>
   17.61 +						<string>d9ce3ace9235249b7edf6f564de83395</string>
   17.62 +						<key>url</key>
   17.63 +						<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.4.0-darwin-20080731b.tar.bz2</uri>
   17.64            </map>
   17.65            <key>linux</key>
   17.66            <map>
   17.67 @@ -464,9 +464,9 @@
   17.68            <key>windows</key>
   17.69            <map>
   17.70              <key>md5sum</key>
   17.71 -            <string>3d4bd78f30f118c6e35f8d367ec25fc2</string>
   17.72 -            <key>url</key>
   17.73 -            <uri>http://downloads.phoenixviewer.com/boost-1.43.0-windows-20100902.tar.bz2</uri>
   17.74 +						<string>17f89b854959b4d728be832d9c8184e4</string>
   17.75 +						<key>url</key>
   17.76 +						<uri>https://github.com/downloads/NickyPerian/imprudence/boost_1_45_VC100_libs_inc_patch4073.tar.bz2</uri>
   17.77            </map>
   17.78          </map>
   17.79        </map>
   17.80 @@ -660,9 +660,9 @@
   17.81            <key>windows</key>
   17.82            <map>
   17.83              <key>md5sum</key>
   17.84 -            <string>fcbb695ff203775fad96d184bf5f34fc</string>
   17.85 -            <key>url</key>
   17.86 -            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freeglut-2.4.0-windows-20090608.tar.bz2</uri>
   17.87 +						<string>2d21dd5bb019f58a96b72acf6ee42ae2</string>
   17.88 +						<key>url</key>
   17.89 +						<uri>https://github.com/downloads/NickyPerian/imprudence/freeglut-2.6.0-windows-20110214Imp.tar.bz2</uri>
   17.90            </map>
   17.91          </map>
   17.92        </map>
   17.93 @@ -753,9 +753,9 @@
   17.94            <key>windows</key>
   17.95            <map>
   17.96              <key>md5sum</key>
   17.97 -            <string>5b8631fe510d4ebaeb965c673937e1e7</string>
   17.98 -            <key>url</key>
   17.99 -            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.3.6-windows-freeglut-20090608.tar.bz2</uri>
  17.100 +						<string>e026920d08611c57ba625735f3c1989e</string>
  17.101 +						<key>url</key>
  17.102 +						<uri>https://github.com/downloads/NickyPerian/imprudence/glui-2.36-windows-20110214Imp.tar.bz2</uri>
  17.103            </map>
  17.104          </map>
  17.105        </map>
  17.106 @@ -943,9 +943,9 @@
  17.107            <key>windows</key>
  17.108            <map>
  17.109              <key>md5sum</key>
  17.110 -            <string>8a6390824f5ad880d164cffafc5f3eeb</string>
  17.111 -            <key>url</key>
  17.112 -            <uri>http://downloads.phoenixviewer.com/json-windows-20100902.tar.bz2</uri>
  17.113 +						<string>3ba7af1b2c04791cc39b4c23b853a488</string>
  17.114 +						<key>url</key>
  17.115 +						<uri>https://github.com/downloads/NickyPerian/imprudence/jsonlib_VC100_libs_inc.tar.bz2</uri>
  17.116            </map>
  17.117          </map>
  17.118        </map>
  17.119 @@ -1070,7 +1070,7 @@
  17.120            </map>
  17.121          </map>
  17.122        </map>
  17.123 -      <key>nd_hacdConvexDecomposition</key>
  17.124 +     <key>nd_hacdConvexDecomposition</key>
  17.125        <map>
  17.126          <key>copyright</key>
  17.127          <string>on file</string>
  17.128 @@ -1083,9 +1083,9 @@
  17.129            <key>windows</key>
  17.130            <map>
  17.131              <key>md5sum</key>
  17.132 -            <string>88ef69383b5591aeb4d33e115df52421</string>
  17.133 +            <string>7c26a71fc635f00759dec0a7bad054b6</string>
  17.134              <key>url</key>
  17.135 -            <uri>http://phoenixviewer.com/app/packages/hacd-win32-20111204.tar.bz2</uri>
  17.136 +            <uri>http://dl.dropbox.com/u/43361170/hacd_win32_20111019.tar.bz2</uri>
  17.137            </map>
  17.138            <key>darwin</key>
  17.139            <map>
  17.140 @@ -1097,9 +1097,9 @@
  17.141            <key>linux</key>
  17.142            <map>
  17.143              <key>md5sum</key>
  17.144 -            <string>9e7d1ad5b756a3113e1fbeb906807722</string>
  17.145 +            <string>e298a471b7beac15a6d31a8ac3b2bbc7</string>
  17.146              <key>url</key>
  17.147 -            <uri>http://downloads.phoenixviewer.com/hacd-linux-20111022.tar.bz2</uri>
  17.148 +            <uri>file:///C:/Users/Bill/lindenhg/3p/3p-hacd-wip/3p_hacd-0.177-windows-20111204.tar.bz2</uri>
  17.149            </map>
  17.150          </map>
  17.151        </map>
  17.152 @@ -1126,9 +1126,9 @@
  17.153            <key>windows</key>
  17.154            <map>
  17.155              <key>md5sum</key>
  17.156 -            <string>7cc9626ff4ac035f8605c996d18ea6a9</string>
  17.157 +            <string>999b265a3af47eb13e9a380d042a1763</string>
  17.158              <key>url</key>
  17.159 -            <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.7.1-20110302.tar.bz2</uri>
  17.160 +            <uri>https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-windows-20110320.tar.bz2</uri>
  17.161            </map>
  17.162          </map>
  17.163        </map>

mercurial