aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-06 01:29:22 -0500
committerJacek Antonelli2009-04-06 01:29:22 -0500
commite06d504a68a72c321794b5e8740ccefcc45f654b (patch)
tree24d844d82b77957e763e6bc9a3103e29aa77f5f3 /linden/indra/cmake
parentApply saved MediaDebugLevel at media init time. (diff)
parentCleaned up logic for bad streams (diff)
downloadmeta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.zip
meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.tar.gz
meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.tar.bz2
meta-impy-e06d504a68a72c321794b5e8740ccefcc45f654b.tar.xz
Merge commit 'mccabe/gst-revamp' into gst-revamp
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r--linden/indra/cmake/00-Common.cmake15
1 files changed, 15 insertions, 0 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index c41591f..27838d6 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -57,6 +57,21 @@ if (WINDOWS)
57 /Zc:wchar_t- 57 /Zc:wchar_t-
58 ) 58 )
59 endif (MSVC80 OR MSVC90) 59 endif (MSVC80 OR MSVC90)
60
61 # VS optimization flags
62 if(MSVC80)
63
64 set(NUMBER_OF_CORES $ENV{NUMBER_OF_PROCESSORS})
65
66 set(CMAKE_CXX_FLAGS_RELEASE
67 "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GT"
68 CACHE STRING "C++ compiler release options" FORCE)
69
70 add_definitions(
71 /MP${NUMBER_OF_CORES}
72 )
73
74 endif (MSVC80)
60 75
61 # Are we using the crummy Visual Studio KDU build workaround? 76 # Are we using the crummy Visual Studio KDU build workaround?
62 if (NOT VS_DISABLE_FATAL_WARNINGS) 77 if (NOT VS_DISABLE_FATAL_WARNINGS)