Changeset 101

Timestamp:

Oct 25, 2007, 4:11:00 PM (17 years ago)

Author:

anonymous

Message:

changed CMakeList.txt; now compiling

Location:

code/branches/network

Files:

• Makefile (modified) (3 diffs)
• src/CMakeLists.txt (modified) (1 diff)

code/branches/network/Makefile

@@ -29 +29 @@
 
 # The CMake executable.
-CMAKE_COMMAND = /usr/pack/cmake-2.4.5-mo/sun4u-sun-solaris2.8/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /usr/pack/cmake-2.4.5-mo/sun4u-sun-solaris2.8/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/pack/cmake-2.4.5-mo/sun4u-sun-solaris2.8/bin/ccmake
+CMAKE_EDIT_COMMAND = /usr/bin/ccmake
 
 # The top-level source directory on which CMake was run.
@@ -52 +52 @@
 edit_cache:
         @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-        /usr/pack/cmake-2.4.5-mo/sun4u-sun-solaris2.8/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+        /usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 
 # Special rule for the target edit_cache
@@ -60 +60 @@
 rebuild_cache:
         @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-        /usr/pack/cmake-2.4.5-mo/sun4u-sun-solaris2.8/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+        /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
 
 # Special rule for the target rebuild_cache

code/branches/network/src/CMakeLists.txt

@@ -4 +4 @@
 SET(SRC_FILES orxonox.cc)
 SET(INC_FILES ExampleApplication.h  ExampleFrameListener.h)
-include_directories( "./tnl" )
 
 #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} /home/scheusso/orxonox/network/src/raklib/libraknet.so.2.4.5.2)
+TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES})
+