[Orxonox-commit 3964] r8638 - code/branches/unity_build/src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-05-28 17:16:27 +0200 (Sat, 28 May 2011)
New Revision: 8638

Modified:
   code/branches/unity_build/src/BuildUnitsConfigGCC.cmake
   code/branches/unity_build/src/BuildUnitsConfigMSVC.cmake
Log:
Added build unit configurations for just 1 CPU thread.

Modified: code/branches/unity_build/src/BuildUnitsConfigGCC.cmake
===================================================================
--- code/branches/unity_build/src/BuildUnitsConfigGCC.cmake	2011-05-28 15:10:01 UTC (rev 8637)
+++ code/branches/unity_build/src/BuildUnitsConfigGCC.cmake	2011-05-28 15:16:27 UTC (rev 8638)
@@ -23,7 +23,7 @@
  #    Configures the number of build units per library
  #
 
-SET(BUILD_UNITS_CONFIG_2_THREADS
+SET(BUILD_UNITS_CONFIG_1_THREADS
   util              1
   core              2
   network           1
@@ -39,6 +39,8 @@
   weapons           1
 )
 
+SET(BUILD_UNITS_CONFIG_2_THREADS ${BUILD_UNITS_CONFIG_1_THREADS})
+
 SET(BUILD_UNITS_CONFIG_4_THREADS
   util              1
   core              4

Modified: code/branches/unity_build/src/BuildUnitsConfigMSVC.cmake
===================================================================
--- code/branches/unity_build/src/BuildUnitsConfigMSVC.cmake	2011-05-28 15:10:01 UTC (rev 8637)
+++ code/branches/unity_build/src/BuildUnitsConfigMSVC.cmake	2011-05-28 15:16:27 UTC (rev 8638)
@@ -23,6 +23,22 @@
  #    Configures the number of build units per library
  #
 
+SET(BUILD_UNITS_CONFIG_1_THREADS
+  util              1
+  core              1
+  network           1
+  tools             1
+  orxonox           2 # Avoids running out of symbol adresses (fix with /bigobj)
+  designtools       1
+  notifications     1
+  objects           1
+  overlays          1
+  pickup            1
+  pong              1
+  questsystem       1
+  weapons           1
+)
+
 SET(BUILD_UNITS_CONFIG_2_THREADS
   util              1
   core              2