Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)

svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833

11 files changed, 60 insertions, 26 deletions

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 333860a31a..c939afc863 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -9,9 +9,9 @@ include(Variables)
 
 set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
 set(CMAKE_CXX_FLAGS_RELEASE
-    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
+    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-    "-DLL_RELEASE=1 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
+    "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
 
 # Don't bother with a MinSizeRel build.
@@ -26,15 +26,18 @@ if (WINDOWS)
   # Don't build DLLs.
   set(BUILD_SHARED_LIBS OFF)
 
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MTd"
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd"
       CACHE STRING "C++ compiler debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MT"
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MT"
+      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD"
       CACHE STRING "C++ compiler release options" FORCE)
 
+  set(CMAKE_CXX_STANDARD_LIBRARIES "")
+  set(CMAKE_C_STANDARD_LIBRARIES "")
+
   add_definitions(
       /DLL_WINDOWS=1
       /DUNICODE
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 2563a98c52..25ee364db8 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -1,5 +1,3 @@
-# -*- cmake -*-
-
 include(BerkeleyDB)
 include(Linking)
 include(Prebuilt)
@@ -19,12 +17,14 @@ else (STANDALONE)
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
       )
+    set(APRICONV_LIBRARIES 
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
+      )
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib ${APRICONV_LIBRARIES}
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib ${APRICONV_LIBRARIES}
       )
-    # Doesn't need to link with iconv.dll
-    set(APRICONV_LIBRARIES "")
   elseif (DARWIN)
     set(APR_LIBRARIES 
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.a
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index c6ccab2613..d23bc2f9c6 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -14,10 +14,18 @@ else (STANDALONE)
   set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
 
   if (WINDOWS)
-    set(OGG_LIBRARIES ogg_static_mt)
-    set(VORBIS_LIBRARIES vorbis_static_mt)
-    set(VORBISENC_LIBRARIES vorbisenc_static_mt)
-    set(VORBISFILE_LIBRARIES vorbisfile_static_mt)
+    set(OGG_LIBRARIES
+        optimized ogg_static
+        debug ogg_static_d)
+    set(VORBIS_LIBRARIES
+        optimized vorbis_static
+        debug vorbis_static_d)
+    set(VORBISENC_LIBRARIES
+        optimized vorbisenc_static
+        debug vorbisenc_static_d)
+    set(VORBISFILE_LIBRARIES
+        optimized vorbisfile_static
+        debug vorbisfile_static_d)
   else (WINDOWS)
     set(OGG_LIBRARIES ogg)
     set(VORBIS_LIBRARIES vorbis)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index a7db67c915..0578ae95ff 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -28,14 +28,14 @@ else (STANDALONE)
           debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION})
     else (MSVC71)
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc80-mt-s-${BOOST_VERSION}
-          debug libboost_program_options-vc80-mt-sgd-${BOOST_VERSION})
+          optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
+          debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
       set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc80-mt-s-${BOOST_VERSION}
-          debug libboost_regex-vc80-mt-sgd-${BOOST_VERSION})
+          optimized libboost_regex-vc80-mt-${BOOST_VERSION}
+          debug libboost_regex-vc80-mt-gd-${BOOST_VERSION})
       set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc80-mt-s-${BOOST_VERSION}
-          debug libboost_signals-vc80-mt-sgd-${BOOST_VERSION})
+          optimized libboost_signals-vc80-mt-${BOOST_VERSION}
+          debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
     endif (MSVC71)
   elseif (DARWIN)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 25e9f6d4f4..aff65cb53e 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -5,6 +5,11 @@ if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
   use_prebuilt_binary(google)
+  if (WINDOWS)
+    set(TCMALLOC_LIBRARIES 
+        debug libtcmalloc_minimal-debug
+        optimized libtcmalloc_minimal-debug)
+  endif (WINDOWS)
   if (LINUX)
     set(TCMALLOC_LIBRARIES tcmalloc)
     set(STACKTRACE_LIBRARIES stacktrace)
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 5d0ee0d2fd..9514d59f64 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -17,7 +17,7 @@ else (STANDALONE)
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a
       )
   elseif (WINDOWS)
-    set(JPEG_LIBRARIES jpeglib_6b)
+    set(JPEG_LIBRARIES jpeglib)
   endif (LINUX)
   set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
index bbcf4cd57d..c47e8878e9 100644
--- a/indra/cmake/LLRender.cmake
+++ b/indra/cmake/LLRender.cmake
@@ -18,8 +18,8 @@ endif (SERVER AND LINUX)
 
 # mapserver requires certain files to be copied so LL_MESA_HEADLESS can be set
 # differently for different object files.
-macro (copy_server_sources _copied_SOURCES)
-  foreach (PREFIX ${_copied_SOURCES})
+macro (copy_server_sources )
+  foreach (PREFIX ${ARGV})
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}_server.cpp
         COMMAND ${CMAKE_COMMAND}
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index c0efa27f6e..e749055abf 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -40,4 +40,9 @@ else (SERVER AND LINUX)
   set(LLWINDOW_LIBRARIES
       llwindow
       )
+  if (WINDOWS)
+      list(APPEND LLWINDOW_LIBRARIES
+          comdlg32
+          )
+  endif (WINDOWS)
 endif (SERVER AND LINUX)
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 167c5dd31c..2bddb95178 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -32,11 +32,16 @@ endif (LINUX)
 
 if (WINDOWS)
   set(WINDOWS_LIBRARIES
+      advapi32
+      shell32
       ws2_32
       mswsock
       psapi
       winmm
       netapi32
+      wldap32
+      gdi32
+      user32
       )
 else (WINDOWS)
   set(WINDOWS_LIBRARIES "")
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 4d0b7b2d8d..cf10c2dda5 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -8,6 +8,12 @@ if (STANDALONE)
   include(FindPNG)
 else (STANDALONE)
   use_prebuilt_binary(libpng)
-  set(PNG_LIBRARIES png12)
+  if (WINDOWS)
+    set(PNG_LIBRARIES 
+      debug libpngd
+      optimized libpng)
+  else (WINDOWS)
+    set(PNG_LIBRARIES png12)
+  endif (WINDOWS)
   set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)
diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake
index 80d4191971..c133248bed 100644
--- a/indra/cmake/ZLIB.cmake
+++ b/indra/cmake/ZLIB.cmake
@@ -10,7 +10,9 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(zlib)
   if (WINDOWS)
-    set(ZLIB_LIBRARIES zlib)
+    set(ZLIB_LIBRARIES 
+      debug zlibd
+      optimized zlib)
   else (WINDOWS)
     set(ZLIB_LIBRARIES z)
   endif (WINDOWS)