[Orxonox-commit 3959] r8633 - code/branches/unity_build/src
rgrieder at orxonox.net
rgrieder at orxonox.net
Sat May 28 02:49:58 CEST 2011
Author: rgrieder
Date: 2011-05-28 02:49:58 +0200 (Sat, 28 May 2011)
New Revision: 8633
Added:
code/branches/unity_build/src/BuildUnitsConfigGCC.cmake
code/branches/unity_build/src/BuildUnitsConfigMSVC.cmake
Removed:
code/branches/unity_build/src/BuildUnitsConfig.cmake
Modified:
code/branches/unity_build/src/OrxonoxConfig.cmake
Log:
Optimised build units for MSVC too by splitting the config file in two.
Note that I had to guess the values for 8 threads, I can not (yet) test that.
Also note that the MSVC config applies to having MSVC configured to make N targets at once (leading up to possibly N*N processes). Seems stupid, is stupid, but is still the fastest when compiling Orxonox.
Deleted: code/branches/unity_build/src/BuildUnitsConfig.cmake
===================================================================
--- code/branches/unity_build/src/BuildUnitsConfig.cmake 2011-05-27 21:35:05 UTC (rev 8632)
+++ code/branches/unity_build/src/BuildUnitsConfig.cmake 2011-05-28 00:49:58 UTC (rev 8633)
@@ -1,72 +0,0 @@
- #
- # ORXONOX - the hottest 3D action shooter ever to exist
- # > www.orxonox.net <
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License along
- # with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- #
- # Author:
- # Reto Grieder
- # Description:
- # Configures the number of build units per library
- #
-
-SET(BUILD_UNITS_CONFIG_2_THREADS
- util 1
- core 2
- network 1
- tools 1
- orxonox 8
- designtools 1
- notifications 1
- objects 2
- overlays 2
- pickup 2
- pong 1
- questsystem 1
- weapons 1
-)
-
-SET(BUILD_UNITS_CONFIG_4_THREADS
- util 1
- core 4
- network 2
- tools 2
- orxonox 8
- designtools 1
- notifications 1
- objects 2
- overlays 2
- pickup 1
- pong 1
- questsystem 1
- weapons 1
-)
-
-SET(BUILD_UNITS_CONFIG_8_THREADS
- util 2
- core 8
- network 5
- tools 3
- orxonox 8
- designtools 1
- notifications 1
- objects 3
- overlays 3
- pickup 2
- pong 1
- questsystem 3
- weapons 3
-)
Copied: code/branches/unity_build/src/BuildUnitsConfigGCC.cmake (from rev 8632, code/branches/unity_build/src/BuildUnitsConfig.cmake)
===================================================================
--- code/branches/unity_build/src/BuildUnitsConfigGCC.cmake (rev 0)
+++ code/branches/unity_build/src/BuildUnitsConfigGCC.cmake 2011-05-28 00:49:58 UTC (rev 8633)
@@ -0,0 +1,72 @@
+ #
+ # ORXONOX - the hottest 3D action shooter ever to exist
+ # > www.orxonox.net <
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along
+ # with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ #
+ # Author:
+ # Reto Grieder
+ # Description:
+ # Configures the number of build units per library
+ #
+
+SET(BUILD_UNITS_CONFIG_2_THREADS
+ util 1
+ core 2
+ network 1
+ tools 1
+ orxonox 8
+ designtools 1
+ notifications 1
+ objects 2
+ overlays 2
+ pickup 2
+ pong 1
+ questsystem 1
+ weapons 1
+)
+
+SET(BUILD_UNITS_CONFIG_4_THREADS
+ util 1
+ core 4
+ network 2
+ tools 2
+ orxonox 8
+ designtools 1
+ notifications 1
+ objects 2
+ overlays 2
+ pickup 1
+ pong 1
+ questsystem 1
+ weapons 1
+)
+
+SET(BUILD_UNITS_CONFIG_8_THREADS
+ util 2
+ core 8
+ network 5
+ tools 3
+ orxonox 8
+ designtools 1
+ notifications 1
+ objects 3
+ overlays 3
+ pickup 2
+ pong 1
+ questsystem 3
+ weapons 3
+)
Copied: code/branches/unity_build/src/BuildUnitsConfigMSVC.cmake (from rev 8632, code/branches/unity_build/src/BuildUnitsConfig.cmake)
===================================================================
--- code/branches/unity_build/src/BuildUnitsConfigMSVC.cmake (rev 0)
+++ code/branches/unity_build/src/BuildUnitsConfigMSVC.cmake 2011-05-28 00:49:58 UTC (rev 8633)
@@ -0,0 +1,72 @@
+ #
+ # ORXONOX - the hottest 3D action shooter ever to exist
+ # > www.orxonox.net <
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along
+ # with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ #
+ # Author:
+ # Reto Grieder
+ # Description:
+ # Configures the number of build units per library
+ #
+
+SET(BUILD_UNITS_CONFIG_2_THREADS
+ util 1
+ core 2
+ network 1
+ tools 1
+ orxonox 2
+ designtools 1
+ notifications 1
+ objects 2
+ overlays 1
+ pickup 1
+ pong 1
+ questsystem 1
+ weapons 1
+)
+
+SET(BUILD_UNITS_CONFIG_4_THREADS
+ util 2
+ core 4
+ network 2
+ tools 2
+ orxonox 4
+ designtools 1
+ notifications 1
+ objects 2
+ overlays 2
+ pickup 1
+ pong 1
+ questsystem 2
+ weapons 2
+)
+
+SET(BUILD_UNITS_CONFIG_8_THREADS
+ util 2
+ core 8
+ network 5
+ tools 3
+ orxonox 8
+ designtools 1
+ notifications 1
+ objects 3
+ overlays 3
+ pickup 2
+ pong 1
+ questsystem 3
+ weapons 3
+)
Modified: code/branches/unity_build/src/OrxonoxConfig.cmake
===================================================================
--- code/branches/unity_build/src/OrxonoxConfig.cmake 2011-05-27 21:35:05 UTC (rev 8632)
+++ code/branches/unity_build/src/OrxonoxConfig.cmake 2011-05-28 00:49:58 UTC (rev 8633)
@@ -51,7 +51,11 @@
SET(NR_OF_BUILD_UNITS ${_nr_of_units})
ENDIF()
ENDIF()
- INCLUDE(BuildUnitsConfig.cmake)
+ IF(CMAKE_COMPILER_IS_GNU)
+ INCLUDE(BuildUnitsConfigGCC.cmake)
+ ELSEIF(MSVC)
+ INCLUDE(BuildUnitsConfigMSVC.cmake)
+ ENDIF()
ENDIF()
# Use WinMain() or main()?
More information about the Orxonox-commit
mailing list