Changeset 1211 for code/branches/camera/src/core

Timestamp:

May 1, 2008, 6:09:05 PM (17 years ago)

Author:

scheusso

Message:

merged trunk changes from 1101 to 1202 into camera branch

Location:

code/branches/camera/src/core

Files:

• CMakeLists.txt (modified) (2 diffs)
• ConfigFileManager.h (modified) (1 diff)
• Script.cc (modified) (1 diff)
• Script.h (modified) (1 diff)
• tolua (copied) (copied from code/trunk/src/core/tolua)
• tolua/tolua.pkg (copied) (copied from code/trunk/src/core/tolua/tolua.pkg)

code/branches/camera/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}
+  tolua/tolua_bind.cc
+#tolua/tolua_bind.h
 )
 
-ADD_LIBRARY( core SHARED ${CORE_SRC_FILES})
+#SET_SOURCE_FILES_PROPERTIES(tolua/tolua_bind.h
+#  PROPERTIES
+#  OBJECT_DEPENDS tolua/tolua_bind.h
+#  OBJECT_DEPENDS tolua/tolua_bind.cc
+#  GENERATED true
+#  HEADER_FILE_ONLY true
+#)
 
-TARGET_LINK_LIBRARIES( core
+GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
+ADD_CUSTOM_COMMAND(
+  OUTPUT tolua/tolua_bind.cc tolua/tolua_bind.h
+  COMMAND ${TOLUA_EXE} -n core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
+  DEPENDS tolua
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
+)
+
+ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
+
+TARGET_LINK_LIBRARIES(core
+  ${Lua_LIBRARIES}
+  ${OIS_LIBRARIES}
+  ${OGRE_LIBRARIES}
   util
-  ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
-  ${OIS_LIBRARIES}
 )

code/branches/camera/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/camera/src/core/Script.cc

@@ -60 +60 @@
     luaopen_debug(luaState_);
 #endif
-    tolua_orxonox_open(luaState_);
+    tolua_core_open(luaState_);
     output_ = "";
   }

code/branches/camera/src/core/Script.h

@@ -57 +57 @@
     public:
       inline static Script* getInstance() { if (!Script::singletonRef) Script::singletonRef = new Script(); return Script::singletonRef; } // tolua_export
-      inline ~Script() { Script::singletonRef = NULL; }
+      inline ~Script() { Script::singletonRef = NULL; };
 
     void loadFile(std::string filename, bool luaTags);