Changeset 3138 for code/branches/pch/src/tolua/changes_orxonox.diff

Timestamp:

Jun 10, 2009, 4:01:42 PM (15 years ago)

Author:

rgrieder

Message:

Tolua update to v1.0.93 is not working properly and I would not know how to fix it. I have created a patch however, just in case we need it after all.

File:

• code/branches/pch/src/tolua/changes_orxonox.diff (modified) (7 diffs)

code/branches/pch/src/tolua/changes_orxonox.diff

@@ -1 @@
---- tolua++.h   Tue Jun  9 16:27:17 2009
-+++ tolua++.h   Tue Jun  9 14:50:04 2009
+diff -ruN tolua/tolua++.h tolua2/tolua++.h
+--- tolua/tolua++.h     Wed Jan 28 21:51:38 2009
++++ tolua2/tolua++.h    Sat Jan 10 14:48:44 2009
 @@ -16,9 +16,34 @@
  #ifndef TOLUA_H
@@ -36 +37 @@
  #define TOLUA_VERSION "tolua++-1.0.92"
  
---- tolua.c     Tue Jun  9 16:27:12 2009
-+++ tolua.c     Tue Jun  9 14:50:04 2009
+diff -ruN tolua/tolua.c tolua2/tolua.c
+--- tolua/tolua.c       Wed Jan 28 21:51:00 2009
++++ tolua2/tolua.c      Sat Jan 10 14:48:45 2009
 @@ -4,6 +4,8 @@
  ** TeCGraf/PUC-Rio
@@ -56 +58 @@
           "  -P       : parse and print structure information (for debug).\n"
           "  -S       : disable support for c++ strings.\n"
-@@ -65,12 +69,12 @@
+@@ -64,12 +68,12 @@
  }
  
@@ -75 +77 @@
  
  static void error (char* o)
-@@ -82,6 +86,9 @@
+@@ -81,6 +85,9 @@
  
  int main (int argc, char* argv[])
@@ -85 +87 @@
   lua_State* L = luaL_newstate();
   luaL_openlibs(L);
-@@ -98,6 +105,7 @@
+@@ -97,6 +104,7 @@
   lua_pushstring(L,TOLUA_VERSION); lua_setglobal(L,"TOLUA_VERSION");
   lua_pushstring(L,LUA_VERSION); lua_setglobal(L,"TOLUA_LUA_VERSION");
@@ -93 +95 @@
   {
    help();
-@@ -125,6 +133,14 @@
+@@ -124,6 +132,14 @@
       case 'o': setfield(L,t,"o",argv[++i]); break;
       case 'n': setfield(L,t,"n",argv[++i]); break;
@@ -108 +110 @@
       case '1': setfield(L,t,"1",""); break;
       case 'L': setfield(L,t,"L",argv[++i]); break;
-@@ -145,25 +161,53 @@
+@@ -143,25 +159,53 @@
    }
    lua_pop(L,1);