2 files changed, 24 insertions, 33 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 27838d6..2d691ad 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -31,9 +31,15 @@ if (WINDOWS)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
       "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MT"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
-  set(CMAKE_CXX_FLAGS_RELEASE
+  if (MSVC80)
+      set(CMAKE_CXX_FLAGS_RELEASE
+      "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /MT"
+      CACHE STRING "C++ compiler release options" FORCE)
+  else (MSVC80)
+      set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MT"
       CACHE STRING "C++ compiler release options" FORCE)
+  endif (MSVC80)
 
   add_definitions(
       /DLL_WINDOWS=1
@@ -57,21 +63,6 @@ if (WINDOWS)
       /Zc:wchar_t-
       )
   endif (MSVC80 OR MSVC90)
-
-  # VS optimization flags
-  if(MSVC80)
-
-    set(NUMBER_OF_CORES $ENV{NUMBER_OF_PROCESSORS})
-
-    set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GT"
-      CACHE STRING "C++ compiler release options" FORCE)
-
-  add_definitions(
-      /MP${NUMBER_OF_CORES}
-      )
-
-  endif (MSVC80)
   
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT VS_DISABLE_FATAL_WARNINGS)
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 29896d0..8bfad11 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -29,23 +29,23 @@ if (WINDOWS)
       gmodule-2.0
       gobject-2.0
       gthread-2.0
-      libgstvideo-0.10
-      libgsttag-0.10
-      libgstsdp-0.10
-      libgstrtsp-0.10
-      libgstrtp-0.10
-      libgstriff-0.10
-      libgstreamer-0.10
-      libgstpbutils-0.10
-      libgstnetbuffer-0.10
-      libgstnet-0.10
-      libgstinterfaces-0.10
-      libgstdshow-0.10
-      libgstdataprotocol-0.10
-      libgstcontroller-0.10
-      libgstbase-0.10
-      libgstaudio-0.10
-      libgstapp-0.10
+      libgstvideo.lib
+      libgsttag.lib
+      libgstsdp.lib
+      libgstrtsp.lib
+      libgstrtp.lib
+      libgstriff.lib
+      libgstreamer-0.10.lib
+      libgstpbutils.lib
+      libgstnetbuffer.lib
+      libgstnet-0.10.lib
+      libgstinterfaces.lib
+      libgstdshow.lib
+      libgstdataprotocol-0.10.lib
+      libgstcontroller-0.10.lib
+      libgstbase-0.10.lib
+      libgstaudio.lib
+      libgstapp.lib
       libxml2
       libxml2_a
       libxml2_a_dll