[Orxonox-commit 1012] r5733 - in code/branches/libraries2/src: . orxonox
landauf at orxonox.net
landauf at orxonox.net
Tue Sep 1 00:04:50 CEST 2009
Author: landauf
Date: 2009-09-01 00:04:50 +0200 (Tue, 01 Sep 2009)
New Revision: 5733
Added:
code/branches/libraries2/src/Orxonox.cc
Removed:
code/branches/libraries2/src/orxonox/Orxonox.cc
Modified:
code/branches/libraries2/src/CMakeLists.txt
code/branches/libraries2/src/orxonox/CMakeLists.txt
Log:
Moved the Orxonox executable to the root of the src directory
Modified: code/branches/libraries2/src/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/CMakeLists.txt 2009-08-31 20:51:36 UTC (rev 5732)
+++ code/branches/libraries2/src/CMakeLists.txt 2009-08-31 22:04:50 UTC (rev 5733)
@@ -98,3 +98,24 @@
ADD_SUBDIRECTORY(libraries)
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 "")
Copied: code/branches/libraries2/src/Orxonox.cc (from rev 5727, code/branches/libraries2/src/orxonox/Orxonox.cc)
===================================================================
--- code/branches/libraries2/src/Orxonox.cc (rev 0)
+++ code/branches/libraries2/src/Orxonox.cc 2009-08-31 22:04:50 UTC (rev 5733)
@@ -0,0 +1,81 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * 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:
+ * Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ at file
+ at brief
+ Entry point of the program.
+*/
+
+#include "OrxonoxPrereqs.h"
+#include "SpecialConfig.h"
+
+#ifdef ORXONOX_USE_WINMAIN
+# ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+# endif
+#include <windows.h>
+#endif
+
+#include "util/Debug.h"
+#include "orxonox/Main.h"
+
+/*
+ at brief
+ 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
+{
+ try
+ {
+#ifndef ORXONOX_USE_WINMAIN
+ std::string strCmdLine;
+ for (int i = 1; i < argc; ++i)
+ strCmdLine += argv[i] + std::string(" ");
+
+ return orxonox::main(strCmdLine);
+#endif
+ }
+ catch (const std::exception& ex)
+ {
+ COUT(0) << "Orxonox failed to initialise: " << ex.what() << std::endl;
+ COUT(0) << "Terminating program." << std::endl;
+ return 1;
+ }
+ catch (...)
+ {
+ COUT(0) << "Orxonox failed to initialise: " << std::endl;
+ COUT(0) << "Terminating program." << std::endl;
+ return 1;
+ }
+}
Modified: code/branches/libraries2/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/orxonox/CMakeLists.txt 2009-08-31 20:51:36 UTC (rev 5732)
+++ code/branches/libraries2/src/orxonox/CMakeLists.txt 2009-08-31 22:04:50 UTC (rev 5733)
@@ -30,11 +30,6 @@
ADD_SUBDIRECTORY(objects)
ADD_SUBDIRECTORY(sound)
-# Translate argument
-IF(ORXONOX_USE_WINMAIN)
- SET(ORXONOX_WIN32 WIN32)
-ENDIF()
-
ORXONOX_ADD_LIBRARY(orxonox
FIND_HEADER_FILES
TOLUA_FILES
@@ -66,21 +61,7 @@
SOURCE_FILES ${ORXONOX_SRC_FILES}
)
-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
# directory and we also want to specify where the external dlls
# (lua, ogre, etc.) are. The problem hereby is that these information cannot
Deleted: code/branches/libraries2/src/orxonox/Orxonox.cc
===================================================================
--- code/branches/libraries2/src/orxonox/Orxonox.cc 2009-08-31 20:51:36 UTC (rev 5732)
+++ code/branches/libraries2/src/orxonox/Orxonox.cc 2009-08-31 22:04:50 UTC (rev 5733)
@@ -1,81 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * 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:
- * Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-/**
- at file
- at brief
- Entry point of the program.
-*/
-
-#include "OrxonoxPrereqs.h"
-#include "SpecialConfig.h"
-
-#ifdef ORXONOX_USE_WINMAIN
-# ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-# endif
-#include <windows.h>
-#endif
-
-#include "util/Debug.h"
-#include "Main.h"
-
-/*
- at brief
- 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
-{
- try
- {
-#ifndef ORXONOX_USE_WINMAIN
- std::string strCmdLine;
- for (int i = 1; i < argc; ++i)
- strCmdLine += argv[i] + std::string(" ");
-
- return orxonox::main(strCmdLine);
-#endif
- }
- catch (const std::exception& ex)
- {
- COUT(0) << "Orxonox failed to initialise: " << ex.what() << std::endl;
- COUT(0) << "Terminating program." << std::endl;
- return 1;
- }
- catch (...)
- {
- COUT(0) << "Orxonox failed to initialise: " << std::endl;
- COUT(0) << "Terminating program." << std::endl;
- return 1;
- }
-}
More information about the Orxonox-commit
mailing list