Changeset 5733

Timestamp:

Sep 1, 2009, 12:04:50 AM (15 years ago)

Author:

landauf

Message:

Moved the Orxonox executable to the root of the src directory

Location:

code/branches/libraries2/src

Files:

• CMakeLists.txt (modified) (1 diff)
• Orxonox.cc (moved) (moved from code/branches/libraries2/src/orxonox/Orxonox.cc) (1 diff)
• orxonox/CMakeLists.txt (modified) (2 diffs)

code/branches/libraries2/src/CMakeLists.txt

@@ -99 +99 @@
 ADD_SUBDIRECTORY(modules)
 ADD_SUBDIRECTORY(orxonox)
+
+################ Executable ################
+
+# Translate argument
+IF(ORXONOX_USE_WINMAIN)
+  SET(ORXONOX_WIN32 WIN32)
+ENDIF()
+
+ORXONOX_ADD_EXECUTABLE(orxonox-main
+  # When defined as WIN32 this removes the console window on Windows
+  ${ORXONOX_WIN32}
+  LINK_LIBRARIES
+    orxonox
+  SOURCE_FILES
+    Orxonox.cc
+  OUTPUT_NAME orxonox
+)
+
+GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)
+GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
+SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")

code/branches/libraries2/src/Orxonox.cc

@@ -45 +45 @@
 
 #include "util/Debug.h"
-#include "Main.h"
+#include "orxonox/Main.h"
 
 /*

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

@@ -31 +31 @@
 ADD_SUBDIRECTORY(sound)
 
-# Translate argument
-IF(ORXONOX_USE_WINMAIN)
-  SET(ORXONOX_WIN32 WIN32)
-ENDIF()
-
 ORXONOX_ADD_LIBRARY(orxonox
   FIND_HEADER_FILES
@@ -67 +62 @@
 )
 
-ORXONOX_ADD_EXECUTABLE(orxonox-main
-  # When defined as WIN32 this removes the console window on Windows
-  ${ORXONOX_WIN32}
-  LINK_LIBRARIES
-    orxonox
-  SOURCE_FILES
-    Orxonox.cc
-  OUTPUT_NAME orxonox
-)
-
-GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)
-GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
-SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
-
 
 # When using Visual Studio we want to use the output directory as working