Changeset 9754 in orxonox.OLD

Timestamp:

Sep 17, 2006, 2:55:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: moved the lua_State definitions out of the Executor.
Now the executor is 'clean' and can be extended by all types, i think…

Location:

branches/new_class_id/src/lib

Files:

• script_engine/Makefile.am (modified) (2 diffs)
• script_engine/executor_lua_state.cc (moved) (moved from branches/new_class_id/src/lib/util/executor/executor_lua_state.cc)
• script_engine/executor_lua_state.h (moved) (moved from branches/new_class_id/src/lib/util/executor/executor_lua_state.h) (1 diff)
• script_engine/script_method.h (modified) (1 diff)
• util/Makefile.am (modified) (2 diffs)

branches/new_class_id/src/lib/script_engine/Makefile.am

@@ -16 +16 @@
                 script_manager.cc \
                 script_class.cc \
-                script_method.cc
-                
+                script_method.cc \
+                executor_lua_state.cc
+
 AM_CPPFLAGS= @LUA_INCLUDES@
 
@@ -25 +26 @@
                 script_manager.h \
                 script_class.h \
-                script_method.h
+                script_method.h \
+                executor_lua_state.h
 
 

branches/new_class_id/src/lib/script_engine/executor_lua_state.h

@@ -25 +25 @@
 
 
-#include "executor_generic.h"
+#include "executor/executor_generic.h"
 
 #include "luaincl.h"

branches/new_class_id/src/lib/script_engine/script_method.h

@@ -9 +9 @@
 #include <vector>
 
-#include "executor/executor_lua_state.h"
+#include "executor_lua_state.h"
 #include "executor/executor_member.h"
 

branches/new_class_id/src/lib/util/Makefile.am

@@ -7 +7 @@
 
 libORXexecutor_a_SOURCES = \
-                executor/executor_lua_state.cc \
                 executor/executor_substring.cc
 
@@ -45 +44 @@
                 executor/executor.h \
                 executor/executor_xml.h \
-                executor/executor_lua_state.h \
                 executor/executor_substring.h \
                 executor/executor_generic.h \