Changeset 3167 for code/branches/pch/src/orxonox

Timestamp:

Jun 14, 2009, 6:11:32 PM (15 years ago)

Author:

rgrieder

Message:

Merged the build system changes from the Gruppenarbeit:

• More Comments (including Doxygen stuff for the config files)
• Removed redundancy between PackageConfigMSVC.cmake and PackageConfigMinGW.cmake
• Option ORXONOX_RELEASE which activates some expensive (build time) optimisations
• Native Visual Leak Detector support (doesn't work for MSVC9 though)
• Added CMake option to disable the console on Windows

Location:

code/branches/pch/src/orxonox

Files:

• CMakeLists.txt (modified) (3 diffs)
• Main.cc (modified) (2 diffs)
• orxonox.vcproj.user.in (moved) (moved from code/branches/pch/src/orxonox/orxonox.vcproj.user)
• sound/SoundBase.h (modified) (1 diff)

code/branches/pch/src/orxonox/CMakeLists.txt

@@ -33 +33 @@
 ADD_SUBDIRECTORY(tools)
 
+# Translate argument
+IF(ORXONOX_USE_WINMAIN)
+  SET(ORXONOX_WIN32 WIN32)
+ENDIF()
+
 ORXONOX_ADD_EXECUTABLE(orxonox
   FIND_HEADER_FILES
@@ -44 +49 @@
     OrxonoxPrecompiledHeaders.h
   PCH_NO_DEFAULT
+  # When defined as WIN32 this removes the console window on Windows
+  ${ORXONOX_WIN32}
   LINK_LIBRARIES
     ${OGRE_LIBRARY}
@@ -85 +92 @@
   STRING(REGEX REPLACE "^Visual Studio ([0-9][0-9]?) .*$" "\\1"
          VISUAL_STUDIO_VERSION_SIMPLE "${CMAKE_GENERATOR}")
-  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox.vcproj.user" "${CMAKE_CURRENT_BINARY_DIR}/orxonox.vcproj.user")
+  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox.vcproj.user.in" "${CMAKE_CURRENT_BINARY_DIR}/orxonox.vcproj.user")
 ENDIF(MSVC)

code/branches/pch/src/orxonox/Main.cc

@@ -28 +28 @@
  */
  
- /**
- @mainpage Orxonox Documentation
- */
-
- /**
- @file
- @brief Entry point of the program.
-  */
+/**
+@file
+@brief
+    Entry point of the program.
+*/
 
 #include "OrxonoxConfig.h"
@@ -47 +44 @@
     Main method. Game starts here (except for static initialisations).
 */
+#ifdef ORXONOX_USE_WINMAIN
+INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
+#else
 int main(int argc, char** argv)
+#endif
 {
     {

code/branches/pch/src/orxonox/sound/SoundBase.h

@@ -30 +30 @@
 
 #include "OrxonoxPrereqs.h"
+#include <cstring> // define NULL
 
 namespace orxonox