Changeset 337 for code/branches/FICN/src/CMakeLists.txt

Timestamp:

Nov 28, 2007, 6:13:04 PM (16 years ago)

Author:

bknecht

Message:

merged merger to FICN branch

File:

• code/branches/FICN/src/CMakeLists.txt (modified) (1 diff)

code/branches/FICN/src/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-# create a few variables to simplify life
-SET(SRC_FILES orxonox/orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc orxonox/core/IdentifierList.cc orxonox/core/Identifier.cc orxonox/core/MetaObjectList.cc orxonox/core/Factory.cc orxonox/core/OrxonoxClass.cc orxonox/objects/BaseObject.cc orxonox/objects/test1.cc orxonox/objects/test2.cc orxonox/objects/test3.cc)
-SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h orxonox/core/IdentifierIncludes.h orxonox/core/Identifier.h orxonox/core/Factory.h orxonox/core/ClassFactory.h orxonox/core/IdentifierList.h orxonox/core/ObjectList.h orxonox/core/MetaObjectList.h orxonox/core/Iterator.h orxonox/core/OrxonoxClass.h orxonox/objects/BaseObject.h orxonox/objects/Test.h orxonox/objects/test1.h orxonox/objects/test2.h orxonox/objects/test3.h)
+ADD_SUBDIRECTORY(orxonox)
+ADD_SUBDIRECTORY(loader)
+ADD_SUBDIRECTORY(network)
+ADD_SUBDIRECTORY(class_hierarchy)
 
-#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})
-
+# =======
+# 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