Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 17, 2008, 8:59:48 PM (16 years ago)
Author:
rgrieder
Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:
code/branches/buildsystem2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem2

  • code/branches/buildsystem2/src/tolua/CMakeLists.txt

    r1815 r2509  
    1 SET (TOLUALIB_SRC_FILES
     1SET(TOLUALIB_SRC_FILES
    22  tolua_event.c
    33  tolua_is.c
     
    77)
    88
    9 ADD_LIBRARY (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
     9ADD_LIBRARY          (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
     10TARGET_LINK_LIBRARIES(tolualib_orxonox ${LUA_LIBRARIES})
    1011
    11 TARGET_LINK_LIBRARIES (tolualib_orxonox
    12   lua_orxonox
     12
     13SET(TOLUAGEN_SRC_FILES
     14  tolua.c
    1315)
    1416
     17ADD_EXECUTABLE       (toluaexe_orxonox ${TOLUAGEN_SRC_FILES})
     18TARGET_LINK_LIBRARIES(toluaexe_orxonox tolualib_orxonox ${LUA_LIBRARIES})
    1519
    16 SET (TOLUAGEN_SRC_FILES
    17   tolua.c
    18   toluabind.c
     20# TODO: determine lua version and set appropriate pack file
     21SET(TOLUA_ALL_PACK all-5.1.lua)
     22SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" PARENT_SCOPE)
     23SET(TOLUA_PARSER_DEPENDENCIES
     24  ${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}
     25  ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua
     26  ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat.lua
     27  ${CMAKE_CURRENT_SOURCE_DIR}/lua/basic.lua
     28  ${CMAKE_CURRENT_SOURCE_DIR}/lua/feature.lua
     29  ${CMAKE_CURRENT_SOURCE_DIR}/lua/verbatim.lua
     30  ${CMAKE_CURRENT_SOURCE_DIR}/lua/code.lua
     31  ${CMAKE_CURRENT_SOURCE_DIR}/lua/typedef.lua
     32  ${CMAKE_CURRENT_SOURCE_DIR}/lua/container.lua
     33  ${CMAKE_CURRENT_SOURCE_DIR}/lua/package.lua
     34  ${CMAKE_CURRENT_SOURCE_DIR}/lua/module.lua
     35  ${CMAKE_CURRENT_SOURCE_DIR}/lua/namespace.lua
     36  ${CMAKE_CURRENT_SOURCE_DIR}/lua/define.lua
     37  ${CMAKE_CURRENT_SOURCE_DIR}/lua/enumerate.lua
     38  ${CMAKE_CURRENT_SOURCE_DIR}/lua/declaration.lua
     39  ${CMAKE_CURRENT_SOURCE_DIR}/lua/variable.lua
     40  ${CMAKE_CURRENT_SOURCE_DIR}/lua/array.lua
     41  ${CMAKE_CURRENT_SOURCE_DIR}/lua/function.lua
     42  ${CMAKE_CURRENT_SOURCE_DIR}/lua/operator.lua
     43  ${CMAKE_CURRENT_SOURCE_DIR}/lua/class.lua
     44  ${CMAKE_CURRENT_SOURCE_DIR}/lua/clean.lua
     45  ${CMAKE_CURRENT_SOURCE_DIR}/lua/doit.lua
     46
     47  PARENT_SCOPE
    1948)
    20 
    21 ADD_EXECUTABLE (toluagen_orxonox ${TOLUAGEN_SRC_FILES})
    22 
    23 TARGET_LINK_LIBRARIES (toluagen_orxonox
    24   lua_orxonox
    25   tolualib_orxonox
    26   m
    27 )
    28 
    29 
    30 SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.1.pkg")
    31 GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen_orxonox LOCATION)
    32 ADD_CUSTOM_COMMAND(
    33   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/toluabind_orxonox.c
    34   COMMAND ${TOLUAGEN_EXE} -n tolua -o ../../src/tolua/toluabind_orxonox.c -H ../../src/tolua/toluabind_orxonox.h ${TOLUA_PACKAGE}
    35   DEPENDS
    36     toluagen_orxonox
    37     tolua-5.1.pkg
    38     lua/compat-5.1.lua
    39     lua/compat.lua
    40     lua/basic.lua
    41     lua/feature.lua
    42     lua/verbatim.lua
    43     lua/code.lua
    44     lua/typedef.lua
    45     lua/container.lua
    46     lua/package.lua
    47     lua/module.lua
    48     lua/namespace.lua
    49     lua/define.lua
    50     lua/enumerate.lua
    51     lua/declaration.lua
    52     lua/variable.lua
    53     lua/array.lua
    54     lua/function.lua
    55     lua/operator.lua
    56     lua/class.lua
    57     lua/clean.lua
    58     lua/doit.lua
    59   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
    60 )
    61 
    62 SET (TOLUAEXE_SRC_FILES
    63   tolua.c
    64   toluabind_orxonox.c
    65 )
    66 
    67 ADD_EXECUTABLE (tolua_orxonox ${TOLUAEXE_SRC_FILES})
    68 
    69 TARGET_LINK_LIBRARIES (tolua_orxonox
    70   lua_orxonox
    71   tolualib_orxonox
    72   m
    73 )
Note: See TracChangeset for help on using the changeset viewer.