Changeset 81

Timestamp:

Oct 22, 2007, 2:37:44 PM (17 years ago)

Author:

nicolasc

Message:

cleanup with CML.txt
moved bin to top-dir

Location:

code/branches/mainloop

Files:

• CMakeCache.txt (added)
• bin (moved) (moved from code/branches/mainloop/src/bin)
• src/CMakeLists.txt (modified) (2 diffs)
• src/orxonox.cc (modified) (1 diff)

code/branches/mainloop/src/CMakeLists.txt

@@ -1 @@
-PROJECT(Tutorial)
-
-#Create some verbose output
-SET(CMAKE_VERBOSE_MAKEFILE TRUE)
-
-#force-set the compile on tardis machines, as default points to g++-3.3
-# only run this test on a lunix/unix machine
-IF (UNIX)
-  FIND_PROGRAM(UNAME_CMD "uname"
-        PATHS "/usr/bin /bin")
-  IF(NOT UNAME_CMD)
-        MESSAGE("Unable to find uname. Tardis-Check cannot be done.")
-  ENDIF(NOT UNAME_CMD)
-  EXECUTE_PROCESS(
-        COMMAND "${UNAME_CMD}" "-n"
-        RESULT_VARIABLE UNAME_RV
-        ERROR_VARIABLE UNAME_EV
-        OUTPUT_VARIABLE UNAME_OV)
-#MESSAGE("Print: UNAME_RV ${UNAME_RV}")
-  IF (NOT "${UNAME_RV}" STREQUAL "0")
-        MESSAGE("ERROR: uname terminated unclean.")
-  ENDIF (NOT "${UNAME_RV}" STREQUAL "0")
-  # check wheter we are on a tardis machine
-  IF ("${UNAME_OV}" MATCHES "tardis")
-    SET (IS_TARDIS "tardis")
-  ENDIF ("${UNAME_OV}" MATCHES "tardis")
-  # if on tardis change compiler
-  IF (IS_TARDIS)
-  MESSAGE("System is a TARDIS: Setting Compiler to g++-3.4.3")
-  SET(CMAKE_CXX_COMPILER "g++-3.4.3")
-  ENDIF(IS_TARDIS)
-ENDIF (UNIX)
+PROJECT(Orxonox)
 
 # create a few variables to simplify life
@@ -36 +5 @@
 SET(INC_FILES ExampleApplication.h  ExampleFrameListener.h  ExampleLoadingBar.h)
 
-#This sets where to look for "Find*.cmake" files
-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
-#Performs the search and sets the variables
-FIND_PACKAGE(OGRE)
-FIND_PACKAGE(OIS)
+#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})
 
-#Sets the search paths for the linking
-LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR})
-#Sets the search path for include files
-INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR})
-
-#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})
-

code/branches/mainloop/src/orxonox.cc

@@ -116 +116 @@
     {
         // create frame listener
-      mFrameListener = new TutorialFrameListener(mWindow, mCamera, mSceneMgr);
+      mFrameListener = new ExampleFrameListener(mWindow, mCamera, mSceneMgr);
       mRoot->addFrameListener(mFrameListener);
     }