Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 29, 2009, 11:35:54 PM (15 years ago)
Author:
rgrieder
Message:

This commit gets a little ugly, couldn't separate that anymore:

  • Renamed UseTolua.cmake to GenerateLuaBindings.cmake
  • Applied the macros for compiler flags, linker flags, header files and source groups Updated the whole build tree for that
  • Created real compiler config scripts (BuildConfigGCC.cmake and BuildConfigMSVC.cmake)
  • Large scale clean up in BuildConfig.cmake
  • You can now specify your own LibraryConfig and BuildConfig script via CMake Cache
  • Lots of small changes and fixes
File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem2/src/ceguilua/CMakeLists.txt

    r2608 r2621  
    2828ADD_CUSTOM_COMMAND(
    2929  OUTPUT ${CEGUILUA_BINARY_DIR}/lua_CEGUI.cpp
    30   COMMAND toluaexe_orxonox -n CEGUI
     30  COMMAND tolua++gen_orxonox -n CEGUI
    3131                             -w ${CEGUILUA_BINARY_DIR}
    3232                             -o lua_CEGUI.cpp
     
    3535                                CEGUI.pkg
    3636  DEPENDS              ${TOLUA_PARSER_DEPENDENCIES}
    37   WORKING_DIRECTORY    ${ORXONOX_LIBRARY_BIN_DIR}
     37  WORKING_DIRECTORY    ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}
    3838  COMMENT "Generating tolua bind files for package CEGUILua"
    3939)
    4040
    41 ADD_CXX_FLAGS("-w44996" MSVC)
     41ADD_COMPILER_FLAGS("-w44996" MSVC)
    4242
    43 ADD_LIBRARY(ceguilua_orxonox SHARED ${CEGUILUA_FILES})
    44 SET_TARGET_PROPERTIES(ceguilua_orxonox PROPERTIES DEFINE_SYMBOL "CEGUILUA_EXPORTS")
    45 TARGET_LINK_LIBRARIES(ceguilua_orxonox
    46   tolualib_orxonox
     43SOURCE_GROUP("Source" FILES ${CEGUILUA_FILES})
     44
     45SET(CEGUILUA_LIBRARY ceguilua_orxonox)
     46SET(CEGUILUA_LIBRARY ${CEGUILUA_LIBRARY} PARENT_SCOPE)
     47ADD_LIBRARY(${CEGUILUA_LIBRARY} SHARED ${CEGUILUA_FILES})
     48SET_TARGET_PROPERTIES(${CEGUILUA_LIBRARY} PROPERTIES DEFINE_SYMBOL "CEGUILUA_EXPORTS")
     49TARGET_LINK_LIBRARIES(${CEGUILUA_LIBRARY}
     50  tolua++_orxonox
    4751  ${LUA_LIBRARIES}
    4852  ${CEGUI_LIBRARY}
Note: See TracChangeset for help on using the changeset viewer.