Changeset 1122 for code/branches/cmake/src/core

Timestamp:

Apr 21, 2008, 7:42:58 PM (17 years ago)

Author:

rgrieder

Message:

merged trunk into cmake branch

Location:

code/branches/cmake/src/core

Files:

• CMakeLists.txt (modified) (2 diffs)
• ConfigFileManager.h (modified) (1 diff)
• Script.cc (modified) (1 diff)
• tolua (deleted)

code/branches/cmake/src/core/CMakeLists.txt

@@ -1 @@
-#get the created files
-AUX_SOURCE_DIRECTORY(tolua TOLUA_BIND_FILES) 
-
-SET( CORE_SRC_FILES
+SET(CORE_SRC_FILES
   OrxonoxClass.cc
   BaseObject.cc
@@ -29 +26 @@
   Tickable.cc
   Script.cc
-  ${TOLUA_BIND_FILES}
 )
 
-ADD_LIBRARY( core SHARED ${CORE_SRC_FILES})
+ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
 
-TARGET_LINK_LIBRARIES( core
+TARGET_LINK_LIBRARIES(core
   util
+  tolualib
   ${Lua_LIBRARIES}
   ${Lua_LIBRARY}

code/branches/cmake/src/core/ConfigFileManager.h

@@ -63 +63 @@
     {
         public:
+            virtual ~ConfigFileEntry() {};
             virtual void setValue(const std::string& value) = 0;
             virtual std::string getValue() const = 0;

code/branches/cmake/src/core/Script.cc

@@ -39 +39 @@
 }
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 #include "tolua/tolua_bind.h"