Changeset 319 for code/branches/merger/src

Timestamp:

Nov 28, 2007, 3:10:28 PM (17 years ago)

Author:

nicolasc

Message:

initial merge of steering

Location:

code/branches/merger/src

Files:

• CMakeLists.txt (modified) (1 diff)
• loader/CMakeLists.txt (modified) (1 diff)
• network/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/core/CMakeLists.txt (modified) (1 diff)
• orxonox/hud/CMakeLists.txt (added)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)
• spaceship_steering.cc (copied) (copied from code/branches/steering/src/spaceship_steering.cc)
• spaceship_steering.h (copied) (copied from code/branches/steering/src/spaceship_steering.h)

code/branches/merger/src/CMakeLists.txt

@@ -6 +6 @@
 ADD_SUBDIRECTORY(class_hierarchy)
 
+# =======
+# PROJECT(Orxonox)
+#
+# # create a few variables to simplify life
+#
+# SET(SRC_FILES orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc spaceship_steering.cc)
+# SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h spaceship_steering.h )
+#
+# #Creates an executable
+# ADD_EXECUTABLE(../bin/main ${SRC_FILES} ${INC_FILES})
+# #Links the executable against OGRE and OIS
+# TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
+#
+# >>>>>>> .merge-right.r318

code/branches/merger/src/loader/CMakeLists.txt

@@ -3 +3 @@
 # TODO find a cleaner way to include xmlParser
 SET(SRC_FILES LevelLoader.cc ../xml/xmlParser.cc)
-SET(INC_FILES LevelLoader.h ../xml/xmlParser.h)
+# SET(INC_FILES LevelLoader.h ../xml/xmlParser.h)
 
 INCLUDE_DIRECTORIES(..)

code/branches/merger/src/network/CMakeLists.txt

@@ -2 +2 @@
 
 SET(SRC_FILES Client.cc ConnectionManager.cc PacketBuffer.cc PacketGenerator.cc Synchronisable.cc dummyclient2.cc ClientConnection.cc GameStateManager.cc PacketDecoder.cc Server.cc dummyclient.cc dummyserver.cc)
-SET(INC_FILES Client.h ClientConnection.h ConnectionManager.h GameStateManager.h PacketBuffer.h PacketManager.h Server.h Synchronisable.h)
 
-ADD_LIBRARY(network ${SRC_FILES} ${INC_FILES})
+ADD_LIBRARY(network ${SRC_FILES})

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

@@ -2 +2 @@
 
 SET(SRC_FILES orxonox.cc)
-SET(INC_FILES)
 
-ADD_EXECUTABLE(../../bin/main ${SRC_FILES} ${INC_FILES})
+ADD_EXECUTABLE(../../bin/main ${SRC_FILES})
 
 TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} loader )

code/branches/merger/src/orxonox/core/CMakeLists.txt

@@ -2 +2 @@
 
 SET(SRC_FILES IdentifierList.cc Identifier.cc MetaObjectList.cc Factory.cc OrxonoxClass.cc)
-SET(INC_FILES IdentifierIncludes.h Identifier.h Factory.h ClassFactory.h IdentifierList.h ObjectList.h MetaObjectList.h Iterator.h OrxonoxClass.h)
 
-ADD_LIBRARY(core ${SRC_FILES} ${INC_FILES})
+ADD_LIBRARY(core ${SRC_FILES})

code/branches/merger/src/orxonox/objects/CMakeLists.txt

@@ -2 +2 @@
 
 SET(SRC_FILES BaseObject.cc test1.cc test2.cc test3.cc)
-SET(INC_FILES BaseObject.h Test.h test1.h test2.h test3.h)
 
-ADD_LIBRARY(objects ${SRC_FILES} ${INC_FILES})
+ADD_LIBRARY(objects ${SRC_FILES})