Changeset 1810 for code/trunk/src/tolua

Timestamp:

Sep 21, 2008, 8:44:25 PM (16 years ago)

Author:

rgrieder

Message:

merged ceguilua branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/tolua/CMakeLists.txt (modified) (3 diffs)
• src/tolua/lua/package.lua (modified) (1 diff)
• src/tolua/tolua++.h (modified) (1 diff)
• src/tolua/tolua-5.0.pkg (deleted)
• src/tolua/tolua-5.1.pkg (modified) (1 prop)
• src/tolua/tolua.c (modified) (1 diff)
• src/tolua/tolua_is.c (modified) (1 diff)
• src/tolua/tolua_map.c (modified) (1 diff)
• src/tolua/tolua_push.c (modified) (1 diff)

code/trunk/src/tolua/CMakeLists.txt

@@ -7 +7 @@
 )
 
-ADD_LIBRARY (tolualib SHARED ${TOLUALIB_SRC_FILES})
+ADD_LIBRARY (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
 
-TARGET_LINK_LIBRARIES (tolualib
-  ${Lua_LIBRARIES}
+TARGET_LINK_LIBRARIES (tolualib_orxonox
+  lua_orxonox
 )
 
@@ -19 +19 @@
 )
 
-ADD_EXECUTABLE (toluagen ${TOLUAGEN_SRC_FILES})
+ADD_EXECUTABLE (toluagen_orxonox ${TOLUAGEN_SRC_FILES})
 
-TARGET_LINK_LIBRARIES (toluagen
-  ${Lua_LIBRARIES}
-  tolualib
+TARGET_LINK_LIBRARIES (toluagen_orxonox
+  lua_orxonox
+  tolualib_orxonox
   m
 )
 
 
-IF (Lua_VERSION EQUAL 5.0)
-  SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.0.pkg")
-ELSE (Lua_VERSION EQUAL 5.0)
-  SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.1.pkg")
-ENDIF (Lua_VERSION EQUAL 5.0)
-
-GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen LOCATION)
+SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.1.pkg")
+GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/toluabind_orxonox.c
   COMMAND ${TOLUAGEN_EXE} -n tolua -o ../../src/tolua/toluabind_orxonox.c -H ../../src/tolua/toluabind_orxonox.h ${TOLUA_PACKAGE}
-  DEPENDS toluagen
+  DEPENDS toluagen_orxonox
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )
@@ -47 +42 @@
 )
 
-ADD_EXECUTABLE (tolua ${TOLUAEXE_SRC_FILES})
+ADD_EXECUTABLE (tolua_orxonox ${TOLUAEXE_SRC_FILES})
 
-TARGET_LINK_LIBRARIES (tolua
-  ${Lua_LIBRARIES}
-  tolualib
+TARGET_LINK_LIBRARIES (tolua_orxonox
+  lua_orxonox
+  tolualib_orxonox
   m
 )

code/trunk/src/tolua/lua/package.lua

@@ -116 +116 @@
         output('#endif\n')
         output('#include "string.h"\n\n')
- output('#include "tolua++.h"\n\n')
+ output('#include "tolua/tolua++.h"\n\n')
 
  if not flags.h then

code/trunk/src/tolua/tolua++.h

@@ -65 +65 @@
 typedef int lua_Object;
 
-#include "lua.h"
-#include "lauxlib.h"
+#include "lua/lua.h"
+#include "lua/lauxlib.h"
 
 struct tolua_Error

code/trunk/src/tolua/tolua.c

@@ -15 +15 @@
 #include "tolua++.h"
 
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
+#include "lua/lua.h"
+#include "lua/lualib.h"
+#include "lua/lauxlib.h"
 
 #include <stdio.h>

code/trunk/src/tolua/tolua_is.c

@@ -14 +14 @@
 
 #include "tolua++.h"
-#include "lauxlib.h"
+#include "lua/lauxlib.h"
 
 #include <stdlib.h>

code/trunk/src/tolua/tolua_map.c

@@ -15 +15 @@
 #include "tolua++.h"
 #include "tolua_event.h"
-#include "lauxlib.h"
+#include "lua/lauxlib.h"
 
 #include <string.h>

code/trunk/src/tolua/tolua_push.c

@@ -14 +14 @@
 
 #include "tolua++.h"
-#include "lauxlib.h"
+#include "lua/lauxlib.h"
 
 #include <stdlib.h>