Changeset 9916 in orxonox.OLD for trunk/src/lib/script_engine

Timestamp:

Nov 3, 2006, 9:29:16 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Windows runs again without any segfaults
it seems, that windows links object files differently… and extremely strange

Location:

trunk/src/lib/script_engine

Files:

• Makefile.am (modified) (1 diff)
• script.cc (modified) (1 diff)
• script_class.cc (modified) (2 diffs)

trunk/src/lib/script_engine/Makefile.am

@@ -13 +13 @@
 
 libORXscript_a_SOURCES = \
+                script_class.cc \
+                script_method.cc \
                 script.cc \
                 script_manager.cc \
-                script_class.cc \
-                script_method.cc \
                 executor_lua_state.cc
 

trunk/src/lib/script_engine/script.cc

@@ -24 +24 @@
 
 ObjectListDefinition(Script);
-
-CREATE_SCRIPTABLE_CLASS(Script,
-                    addMethod("addObject", Executor2<Script, lua_State*,const std::string&, const std::string& >(&Script::addObject))
-                    ->addMethod("registerClass", Executor1<Script, lua_State*,const std::string&>(&Script::registerClass))
-                    ->addMethod("selectFunction", Executor2ret<Script, lua_State*, bool, const std::string&, int >(&Script::selectFunction))
-                    ->addMethod("executeFunction", Executor0ret<Script, lua_State*,bool >(&Script::executeFunction))
-                     );
 
 

trunk/src/lib/script_engine/script_class.cc

@@ -17 +17 @@
 
 #include "script_class.h"
+#include "script.h"
+#include "debug.h"
 #include <cassert>
 
 ObjectListDefinition(ScriptClass);
+
+CREATE_SCRIPTABLE_CLASS(Script,
+                    addMethod("addObject", Executor2<Script, lua_State*,const std::string&, const std::string& >(&Script::addObject))
+                    ->addMethod("registerClass", Executor1<Script, lua_State*,const std::string&>(&Script::registerClass))
+                    ->addMethod("selectFunction", Executor2ret<Script, lua_State*, bool, const std::string&, int >(&Script::selectFunction))
+                    ->addMethod("executeFunction", Executor0ret<Script, lua_State*,bool >(&Script::executeFunction))
+                     );
 /**
  * @brief standard constructor
@@ -27 +36 @@
     : BaseObject(name), _classID(classID)
 {
+  PRINTF(4)("Name %s\n", name.c_str());
   assert(scriptMethods != NULL);
   this->registerObject(this, ScriptClass::_objectList);