Changeset 1809

Timestamp:

Sep 21, 2008, 8:39:08 PM (16 years ago)

Author:

rgrieder

Message:

removed version specific lua folders
removed lua 5.0 package file int tolua/ folder
commented script section in FindCEGUI.cmake

Location:

code/branches/ceguilua

Files:

• cmake/FindCEGUI.cmake (modified) (6 diffs)
• src/lua-5.0.3 (deleted)
• src/lua-5.1.3 (deleted)
• src/lua/Makefile (deleted)
• src/tolua/CMakeLists.txt (modified) (1 diff)
• src/tolua/tolua-5.0.pkg (deleted)

code/branches/ceguilua/cmake/FindCEGUI.cmake

@@ -19 +19 @@
 #                 > www.orxonox.net <
 
-IF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
+IF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
     SET(CEGUI_FIND_QUIETLY TRUE) # Already in cache, be silent
-ENDIF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
+ENDIF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
 
 IF (WIN32) #Windows
@@ -39 +39 @@
     ENDIF (CEGUI_LIBDIR)
 
-    IF (NOT CEGUI_SCRIPT_LIBDIR)
-        # Search Lua script module
-        SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
-        FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
-            ../libs/cegui-0.6.1/bin
-        )
-        IF (NOT CEGUI_SCRIPT_LIBDIR)
-            SET(CEGUI_SCRIPT_LIBRARIES "CEGUILua")
-            FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
-                ../libs/cegui-0.6.1/bin
-            )
-            IF (NOT CEGUI_SCRIPT_LIBDIR)
-                SET(CEGUI_SCRIPT_LIBRARIES)
-            ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
-        ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
-    ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
+#    IF (NOT CEGUI_SCRIPT_LIBDIR)
+#        # Search Lua script module
+#        SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
+#        FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
+#            ../libs/cegui-0.6.1/bin
+#        )
+#       IF (NOT CEGUI_SCRIPT_LIBDIR)
+#            SET(CEGUI_SCRIPT_LIBRARIES "CEGUILua")
+#            FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
+#                ../libs/cegui-0.6.1/bin
+#            )
+#            IF (NOT CEGUI_SCRIPT_LIBDIR)
+#                SET(CEGUI_SCRIPT_LIBRARIES)
+#            ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
+#        ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
+#    ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
 
-    # Strip the filename from the path
-    IF (CEGUI_SCRIPT_LIBDIR)
-        GET_FILENAME_COMPONENT(CEGUI_SCRIPT_LIBDIR ${CEGUI_SCRIPT_LIBDIR} PATH)
-        SET (CEGUI_SCRIPT_LIB_DIR ${CEGUI_SCRIPT_LIBDIR} CACHE FILEPATH "")
-    ENDIF (CEGUI_SCRIPT_LIBDIR)
+#    # Strip the filename from the path
+#    IF (CEGUI_SCRIPT_LIBDIR)
+#        GET_FILENAME_COMPONENT(CEGUI_SCRIPT_LIBDIR ${CEGUI_SCRIPT_LIBDIR} PATH)
+#        SET (CEGUI_SCRIPT_LIB_DIR ${CEGUI_SCRIPT_LIBDIR} CACHE FILEPATH "")
+#    ENDIF (CEGUI_SCRIPT_LIBDIR)
 
 ELSE (WIN32) #Unix
@@ -68 +68 @@
     SET(CEGUI_LIB_DIR ${CEGUI_LIBDIR})
     SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
-    SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
-    SET(CEGUI_SCRIPT_LIB_DIR)
+#    SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
+#    SET(CEGUI_SCRIPT_LIB_DIR)
 ENDIF (WIN32)
 
-IF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
+IF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
     SET(CEGUI_FOUND TRUE)
 
@@ -82 +82 @@
     SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
     SET(CEGUI_LIB_DIR ${CEGUI_LIB_DIR} CACHE PATH "")
-    SET(CEGUI_SCRIPT_LIBRARIES ${CEGUI_SCRIPT_LIBRARIES} CACHE PATH "")
-ENDIF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
+#    SET(CEGUI_SCRIPT_LIBRARIES ${CEGUI_SCRIPT_LIBRARIES} CACHE PATH "")
+ENDIF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
 
 IF (CEGUI_FOUND)
-    # check CEGUIVersion.h to set the version macro
-    FILE(READ "${CEGUI_INCLUDE_DIR}/CEGUIVersion.h" ceguiVersionFile)
-    STRING(REGEX MATCH "\\#define CEGUI_VERSION_MINOR ([56])" "\\1" CEGUI_VERSION ${ceguiVersionFile})
-    MESSAGE(STATUS "${CEGUI_VERSION}")
     IF (NOT CEGUI_FIND_QUIETLY)
         MESSAGE(STATUS "CEGUI was found.")
@@ -96 +92 @@
             MESSAGE (STATUS "  library path: ${CEGUI_LIB_DIR}")
             MESSAGE (STATUS "  libraries:    ${CEGUI_LIBRARIES}")
-            MESSAGE (STATUS "           :    ${CEGUI_SCRIPT_LIBRARIES}")
+#            MESSAGE (STATUS "           :    ${CEGUI_SCRIPT_LIBRARIES}")
         ENDIF (VERBOSE_FIND)
     ENDIF (NOT CEGUI_FIND_QUIETLY)
@@ -109 +105 @@
         MESSAGE(SEND_ERROR "CEGUI libraries not known.")
     ENDIF (NOT CEGUI_LIBRARIES)
-    IF (NOT CEGUI_SCRIPT_LIBRARIES)
-        MESSAGE(SEND_ERROR "CEGUI Lua script module was not found.")
-    ENDIF (NOT CEGUI_SCRIPT_LIBRARIES)
+#    IF (NOT CEGUI_SCRIPT_LIBRARIES)
+#        MESSAGE(SEND_ERROR "CEGUI Lua script module was not found.")
+#    ENDIF (NOT CEGUI_SCRIPT_LIBRARIES)
 ENDIF (CEGUI_FOUND)
 

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

@@ -28 +28 @@
 
 
-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)
-
+SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.1.pkg")
 GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(