Changeset 2664 for code/branches/buildsystem3/src/core/LuaBind.h

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• src/core/LuaBind.h (modified) (2 diffs, 1 prop)

code/branches/buildsystem3/src/core/LuaBind.h

@@ -39 +39 @@
 
 extern "C" {
-#include <lua/lua.h>
+#include <lua.h>
 }
 
@@ -46 +46 @@
 #include <string>
 
-namespace orxonox // tolua_export
-{ // tolua_export
+// tolua_begin
+namespace orxonox
+{
   class _CoreExport LuaBind
   {
-  /*
-  class LuaBind { // tolua_export
-  */
+
+// tolua_end
     struct LoadS {
       const char *s;