Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
4 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ceguilua/cmake/FindCEGUI.cmake

    r1805 r1809  
    1919#                 > www.orxonox.net <
    2020
    21 IF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
     21IF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    2222    SET(CEGUI_FIND_QUIETLY TRUE) # Already in cache, be silent
    23 ENDIF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
     23ENDIF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    2424
    2525IF (WIN32) #Windows
     
    3939    ENDIF (CEGUI_LIBDIR)
    4040
    41     IF (NOT CEGUI_SCRIPT_LIBDIR)
    42         # Search Lua script module
    43         SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
    44         FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
    45             ../libs/cegui-0.6.1/bin
    46         )
    47         IF (NOT CEGUI_SCRIPT_LIBDIR)
    48             SET(CEGUI_SCRIPT_LIBRARIES "CEGUILua")
    49             FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
    50                 ../libs/cegui-0.6.1/bin
    51             )
    52             IF (NOT CEGUI_SCRIPT_LIBDIR)
    53                 SET(CEGUI_SCRIPT_LIBRARIES)
    54             ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
    55         ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
    56     ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
     41#    IF (NOT CEGUI_SCRIPT_LIBDIR)
     42#        # Search Lua script module
     43#        SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
     44#        FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
     45#            ../libs/cegui-0.6.1/bin
     46#        )
     47#       IF (NOT CEGUI_SCRIPT_LIBDIR)
     48#            SET(CEGUI_SCRIPT_LIBRARIES "CEGUILua")
     49#            FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
     50#                ../libs/cegui-0.6.1/bin
     51#            )
     52#            IF (NOT CEGUI_SCRIPT_LIBDIR)
     53#                SET(CEGUI_SCRIPT_LIBRARIES)
     54#            ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
     55#        ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
     56#    ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
    5757
    58     # Strip the filename from the path
    59     IF (CEGUI_SCRIPT_LIBDIR)
    60         GET_FILENAME_COMPONENT(CEGUI_SCRIPT_LIBDIR ${CEGUI_SCRIPT_LIBDIR} PATH)
    61         SET (CEGUI_SCRIPT_LIB_DIR ${CEGUI_SCRIPT_LIBDIR} CACHE FILEPATH "")
    62     ENDIF (CEGUI_SCRIPT_LIBDIR)
     58#    # Strip the filename from the path
     59#    IF (CEGUI_SCRIPT_LIBDIR)
     60#        GET_FILENAME_COMPONENT(CEGUI_SCRIPT_LIBDIR ${CEGUI_SCRIPT_LIBDIR} PATH)
     61#        SET (CEGUI_SCRIPT_LIB_DIR ${CEGUI_SCRIPT_LIBDIR} CACHE FILEPATH "")
     62#    ENDIF (CEGUI_SCRIPT_LIBDIR)
    6363
    6464ELSE (WIN32) #Unix
     
    6868    SET(CEGUI_LIB_DIR ${CEGUI_LIBDIR})
    6969    SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
    70     SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
    71     SET(CEGUI_SCRIPT_LIB_DIR)
     70#    SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
     71#    SET(CEGUI_SCRIPT_LIB_DIR)
    7272ENDIF (WIN32)
    7373
    74 IF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
     74IF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    7575    SET(CEGUI_FOUND TRUE)
    7676
     
    8282    SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
    8383    SET(CEGUI_LIB_DIR ${CEGUI_LIB_DIR} CACHE PATH "")
    84     SET(CEGUI_SCRIPT_LIBRARIES ${CEGUI_SCRIPT_LIBRARIES} CACHE PATH "")
    85 ENDIF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
     84#    SET(CEGUI_SCRIPT_LIBRARIES ${CEGUI_SCRIPT_LIBRARIES} CACHE PATH "")
     85ENDIF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    8686
    8787IF (CEGUI_FOUND)
    88     # check CEGUIVersion.h to set the version macro
    89     FILE(READ "${CEGUI_INCLUDE_DIR}/CEGUIVersion.h" ceguiVersionFile)
    90     STRING(REGEX MATCH "\\#define CEGUI_VERSION_MINOR ([56])" "\\1" CEGUI_VERSION ${ceguiVersionFile})
    91     MESSAGE(STATUS "${CEGUI_VERSION}")
    9288    IF (NOT CEGUI_FIND_QUIETLY)
    9389        MESSAGE(STATUS "CEGUI was found.")
     
    9692            MESSAGE (STATUS "  library path: ${CEGUI_LIB_DIR}")
    9793            MESSAGE (STATUS "  libraries:    ${CEGUI_LIBRARIES}")
    98             MESSAGE (STATUS "           :    ${CEGUI_SCRIPT_LIBRARIES}")
     94#            MESSAGE (STATUS "           :    ${CEGUI_SCRIPT_LIBRARIES}")
    9995        ENDIF (VERBOSE_FIND)
    10096    ENDIF (NOT CEGUI_FIND_QUIETLY)
     
    109105        MESSAGE(SEND_ERROR "CEGUI libraries not known.")
    110106    ENDIF (NOT CEGUI_LIBRARIES)
    111     IF (NOT CEGUI_SCRIPT_LIBRARIES)
    112         MESSAGE(SEND_ERROR "CEGUI Lua script module was not found.")
    113     ENDIF (NOT CEGUI_SCRIPT_LIBRARIES)
     107#    IF (NOT CEGUI_SCRIPT_LIBRARIES)
     108#        MESSAGE(SEND_ERROR "CEGUI Lua script module was not found.")
     109#    ENDIF (NOT CEGUI_SCRIPT_LIBRARIES)
    114110ENDIF (CEGUI_FOUND)
    115111
  • code/branches/ceguilua/src/tolua/CMakeLists.txt

    r1804 r1809  
    2828
    2929
    30 IF (Lua_VERSION EQUAL 5.0)
    31   SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.0.pkg")
    32 ELSE (Lua_VERSION EQUAL 5.0)
    33   SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.1.pkg")
    34 ENDIF (Lua_VERSION EQUAL 5.0)
    35 
     30SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.1.pkg")
    3631GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen_orxonox LOCATION)
    3732ADD_CUSTOM_COMMAND(
Note: See TracChangeset for help on using the changeset viewer.