Changeset 2608 for code/branches/buildsystem2/src/ceguilua/ceguilua-0.6.1/ceguilua

Timestamp:

Jan 29, 2009, 8:13:22 PM (16 years ago)

Author:

rgrieder

Message:

Large cleanup in CEGUILua:

• Removed the heavy 1.7MB bind files and added the small pkg files from the CEGUI source instead
• Those pkg files get copied version incrementally (starting with 0.5.0) to the binary dir. That saves a lot of files when having 4 different versions.
• Added support for CEGUI 0.6.0 and 0.6.2
• Added library info files
• CEGUILua 0.5.0 finally supports Lua 5.1 too That means all version support both Lua 5.0 and 5.1
• Added unified diffs with the changes to the CEGUILua source

Location:

code/branches/buildsystem2/src/ceguilua

Files:

• . (added)
• ceguilua-0.6.1 (moved) (moved from code/branches/buildsystem2/src/ceguilua-0.6.1)
• ceguilua-0.6.1/ceguilua/CEGUILua.cpp (modified) (5 diffs)
• ceguilua-0.6.1/ceguilua/CEGUILua.h (modified) (2 diffs)
• ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.cpp (modified) (1 diff)
• ceguilua-0.6.1/ceguilua/CMakeLists.txt (deleted)
• ceguilua-0.6.1/ceguilua/changes_orxonox.diff (added)
• ceguilua-0.6.1/ceguilua/lua_CEGUI.cpp (deleted)

code/branches/buildsystem2/src/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.cpp

@@ -28 +28 @@
  *   OTHER DEALINGS IN THE SOFTWARE.
  ***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#   include "config.h"
-#endif
-
 #include "CEGUI.h"
 #include "CEGUIConfig.h"
@@ -46 +42 @@
 }
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 
 // prototype for bindings initialisation function
@@ -75 +71 @@
             {0, 0}
         };
-    #endif /* CEGUI_LUA_VER >= 51 */
+    #endif /* LUA_VERSION_NUM >= 501 */
 
     // create a lua state
@@ -90 +86 @@
                 lua_call(d_state, 1, 0);
             }
-    #else /* CEGUI_LUA_VER >= 51 */
+    #else /* LUA_VERSION_NUM >= 501 */
         luaopen_base(d_state);
         luaopen_io(d_state);
@@ -99 +95 @@
             luaopen_debug(d_state);
         #endif
-    #endif /* CEGUI_LUA_VER >= 51 */
+    #endif /* LUA_VERSION_NUM >= 501 */
 
     setModuleIdentifierString();

code/branches/buildsystem2/src/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILua.h

@@ -31 +31 @@
 #define _CEGUILua_h_
 
-/*** CHANGES BY ORXONOX TEAM FOR MINGW32 ***/
+
 /*************************************************************************
         Import / Export control macros
@@ -39 +39 @@
 #       define CEGUILUA_API __declspec(dllexport)
 #   else
-#      if defined( __MINGW32__ )
-#          define CEGUILUA_API
-#      else
-#          define CEGUILUA_API __declspec(dllimport)
-#      endif
+#       if defined( __MINGW32__ )
+#           define CEGUILUA_API
+#       else
+#           define CEGUILUA_API __declspec(dllimport)
+#       endif
 #   endif
 #else

code/branches/buildsystem2/src/ceguilua/ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.cpp

@@ -40 +40 @@
 }
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 
 // Start of CEGUI namespace section