Changeset 1975 for code/branches/buildsystem/src/tolua

Timestamp:

Oct 20, 2008, 5:53:16 PM (16 years ago)

Author:

adrfried

Message:

lua removed and using extern one

Location:

code/branches/buildsystem/src/tolua

Files:

• CMakeLists.txt (modified) (4 diffs)
• tolua++.h (modified) (1 diff)
• tolua.c (modified) (1 diff)
• tolua_is.c (modified) (1 diff)
• tolua_map.c (modified) (1 diff)
• tolua_push.c (modified) (1 diff)

code/branches/buildsystem/src/tolua/CMakeLists.txt

@@ +1 @@
+# TODO: only build the object files once
+
 SET (TOLUALIB_SRC_FILES
   tolua_event.c
@@ -8 +10 @@
 
 ADD_LIBRARY (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
-
-TARGET_LINK_LIBRARIES (tolualib_orxonox
-  lua_orxonox
-)
-
+TARGET_LINK_LIBRARIES (tolualib_orxonox ${LUA_LIBRARIES})
 
 SET (TOLUAGEN_SRC_FILES
@@ -19 +17 @@
 )
 
-ADD_EXECUTABLE (toluagen_orxonox ${TOLUAGEN_SRC_FILES})
-
-TARGET_LINK_LIBRARIES (toluagen_orxonox
-  lua_orxonox
-  tolualib_orxonox
-  m
-)
-
+ADD_EXECUTABLE (toluagen_orxonox ${TOLUAGEN_SRC_FILES} ${TOLUALIB_SRC_FILES})
+TARGET_LINK_LIBRARIES (toluagen_orxonox ${LUA_LIBRARIES})
 
 SET (TOLUA_PACKAGE "${CMAKE_CURRENT_SOURCE_DIR}/tolua-5.1.pkg")
@@ -65 +57 @@
 )
 
-ADD_EXECUTABLE (tolua_orxonox ${TOLUAEXE_SRC_FILES})
-
-TARGET_LINK_LIBRARIES (tolua_orxonox
-  lua_orxonox
-  tolualib_orxonox
-  m
-)
+ADD_EXECUTABLE (tolua_orxonox ${TOLUAEXE_SRC_FILES} ${TOLUALIB_SRC_FILES})
+TARGET_LINK_LIBRARIES (tolua_orxonox ${LUA_LIBRARIES})

code/branches/buildsystem/src/tolua/tolua++.h

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

code/branches/buildsystem/src/tolua/tolua.c

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

code/branches/buildsystem/src/tolua/tolua_is.c

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

code/branches/buildsystem/src/tolua/tolua_map.c

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

code/branches/buildsystem/src/tolua/tolua_push.c

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