Changeset 319 for code/branches/merger/src/orxonox

Timestamp:

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

Author:

nicolasc

Message:

initial merge of steering

Location:

code/branches/merger/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• hud/CMakeLists.txt (added)
• objects/CMakeLists.txt (modified) (1 diff)

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})