Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 14, 2009, 10:53:45 PM (15 years ago)
Author:
rgrieder
Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:
code/branches/buildsystem3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem3

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

    r1815 r2664  
    1 SET (TOLUALIB_SRC_FILES
     1 #
     2 #             ORXONOX - the hottest 3D action shooter ever to exist
     3 #                             > www.orxonox.net <
     4 #
     5 #        This program is free software; you can redistribute it and/or
     6 #         modify it under the terms of the GNU General Public License
     7 #        as published by the Free Software Foundation; either version 2
     8 #            of the License, or (at your option) any later version.
     9 #
     10 #       This program is distributed in the hope that it will be useful,
     11 #        but WITHOUT ANY WARRANTY; without even the implied warranty of
     12 #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13 #                 GNU General Public License for more details.
     14 #
     15 #   You should have received a copy of the GNU General Public License along
     16 #      with this program; if not, write to the Free Software Foundation,
     17 #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     18 #
     19
     20################### Tolua++ library ###################
     21
     22SET(TOLUA++_FILES
     23  tolua_event.h
     24  tolua++.h
     25
    226  tolua_event.c
    327  tolua_is.c
     
    630  tolua_to.c
    731)
     32GENERATE_SOURCE_GROUPS(${TOLUA++_FILES})
    833
    9 ADD_LIBRARY (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
     34ADD_COMPILER_FLAGS("-w44996" MSVC)
    1035
    11 TARGET_LINK_LIBRARIES (tolualib_orxonox
    12   lua_orxonox
    13 )
     36ADD_LIBRARY(tolua++_orxonox SHARED ${TOLUA++_FILES})
     37SET_TARGET_PROPERTIES(tolua++_orxonox PROPERTIES DEFINE_SYMBOL "TOLUA_SHARED_BUILD")
     38TARGET_LINK_LIBRARIES(tolua++_orxonox ${LUA_LIBRARIES})
     39
     40ORXONOX_INSTALL(tolua++_orxonox)
    1441
    1542
    16 SET (TOLUAGEN_SRC_FILES
    17   tolua.c
    18   toluabind.c
     43################## Tolua++ generator ##################
     44
     45ADD_EXECUTABLE(tolua++app_orxonox tolua.c)
     46TARGET_LINK_LIBRARIES(tolua++app_orxonox tolua++_orxonox ${LUA_LIBRARIES})
     47
     48OPTION(TOLUA_PARSER_RELEASE "Disable all debug messages from tolua bind files for Release and MinSizeRel build types." FALSE)
     49
     50# Set some variables to the cache in order to use them in the TOLUA macro
     51SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua" CACHE INTERNAL "")
     52SET(TOLUA_PARSER_DEPENDENCIES
     53  tolua++app_orxonox
     54  ${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua
     55  ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua
     56  ${CMAKE_CURRENT_SOURCE_DIR}/lua/compat.lua
     57  ${CMAKE_CURRENT_SOURCE_DIR}/lua/basic.lua
     58  ${CMAKE_CURRENT_SOURCE_DIR}/lua/feature.lua
     59  ${CMAKE_CURRENT_SOURCE_DIR}/lua/verbatim.lua
     60  ${CMAKE_CURRENT_SOURCE_DIR}/lua/code.lua
     61  ${CMAKE_CURRENT_SOURCE_DIR}/lua/typedef.lua
     62  ${CMAKE_CURRENT_SOURCE_DIR}/lua/container.lua
     63  ${CMAKE_CURRENT_SOURCE_DIR}/lua/package.lua
     64  ${CMAKE_CURRENT_SOURCE_DIR}/lua/module.lua
     65  ${CMAKE_CURRENT_SOURCE_DIR}/lua/namespace.lua
     66  ${CMAKE_CURRENT_SOURCE_DIR}/lua/define.lua
     67  ${CMAKE_CURRENT_SOURCE_DIR}/lua/enumerate.lua
     68  ${CMAKE_CURRENT_SOURCE_DIR}/lua/declaration.lua
     69  ${CMAKE_CURRENT_SOURCE_DIR}/lua/variable.lua
     70  ${CMAKE_CURRENT_SOURCE_DIR}/lua/array.lua
     71  ${CMAKE_CURRENT_SOURCE_DIR}/lua/function.lua
     72  ${CMAKE_CURRENT_SOURCE_DIR}/lua/operator.lua
     73  ${CMAKE_CURRENT_SOURCE_DIR}/lua/class.lua
     74  ${CMAKE_CURRENT_SOURCE_DIR}/lua/clean.lua
     75  ${CMAKE_CURRENT_SOURCE_DIR}/lua/doit.lua
     76
     77  CACHE INTERNAL ""
    1978)
    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.