VC10 transition, Webkit 4.7.1

indra/cmake/00-Common.cmake

@@ -10,6 +10,8 @@ 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 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
+set(CMAKE_C_FLAGS_RELEASE
+    "${CMAKE_CXX_FLAGS_RELEASE}")
 set(CMAKE_CXX_FLAGS_RELEASESSE2
     "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
 #llimage now requires this (?)
@@ -29,6 +31,10 @@ if (WINDOWS)
   # Don't build DLLs.
   set(BUILD_SHARED_LIBS OFF)
 
+  if (MSVC10)
+    set(MSVC100 TRUE)
+  endif (MSVC10)
+
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd"
       CACHE STRING "C++ compiler debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
@@ -63,6 +69,7 @@ if (WINDOWS)
       /Zc:forScope
       /nologo
       /Oy-
+      /Zc:wchar_t-
       )
      
   if(MSVC80 OR MSVC90 OR MSVC100)
@@ -75,9 +82,6 @@ if (WINDOWS)
     set(CMAKE_C_FLAGS_RELEASESSE2
       "${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
       CACHE STRING "C compiler release-SSE2 options" FORCE)
-    add_definitions(
-      /Zc:wchar_t-
-      )
   endif (MSVC80 OR MSVC90 OR MSVC100)
   
   # Are we using the crummy Visual Studio KDU build workaround?
@@ -207,6 +211,7 @@ if (LINUX)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
   set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}")
+  set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
   set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O3 ${CMAKE_CXX_FLAGS_RELEASESSE2}")
   set(CMAKE_C_FLAGS_RELEASESSE2 "-O3 ${CMAKE_C_FLAGS_RELEASESSE2}")
 endif (LINUX)

indra/cmake/Boost.cmake

@@ -17,7 +17,7 @@ else (STANDALONE)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 
   if (WINDOWS)
-    set(BOOST_VERSION 1_39)
+    set(BOOST_VERSION 1_45)
 
 	# SNOW-788
 	# 00-Common.cmake alreay sets MSVC_SUFFIX to be correct for the VS we are using eg VC71, VC80, VC90 etc

indra/cmake/OpenGL.cmake

@@ -4,6 +4,7 @@ include(Prebuilt)
 if (NOT STANDALONE)
   use_prebuilt_binary(GL)
   # possible glh_linear should have its own .cmake file instead
-  use_prebuilt_binary(glh_linear)
+  #use_prebuilt_binary(glh_linear)
+  # actually... not any longer, it's now in git -SG
   set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (NOT STANDALONE)

indra/newview/llfloaterabout.cpp

@@ -275,7 +275,7 @@ LLFloaterAbout::LLFloaterAbout()
 
 	// TODO: Implement media plugin version query
 
-	support.append("Qt Webkit Version: 4.6.0 ");
+	support.append("Qt Webkit Version: 4.7.1 ");
 	support.append("\n");
 
 	if (gPacketsIn > 0)