Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1979


Ignore:
Timestamp:
Oct 20, 2008, 5:53:43 PM (11 years ago)
Author:
adrfried
Message:

test

Location:
code/branches/buildsystem
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem/CMakeLists.txt

    r1977 r1979  
    7373FIND_PACKAGE(OggVorbis REQUIRED)
    7474FIND_PACKAGE(ZLIB REQUIRED)
    75 FIND_PACKAGE(Lua50 REQUIRED)
    7675FIND_PACKAGE(TCL REQUIRED)
    7776FIND_PACKAGE(DirectX REQUIRED)
    7877
     78FIND_PACKAGE(Lua51)
     79IF(NOT LUA_FOUND)
     80  FIND_PACKAGE(Lua50 REQUIRED)
     81ENDIF(NOT LUA_FOUND)
     82
    7983# Add main source dir
    8084ADD_SUBDIRECTORY(src)
  • code/branches/buildsystem/src/CMakeLists.txt

    r1977 r1979  
    3333  ois
    3434  orxonox
     35  tolua
    3536)
    3637
     
    4748# So first, find out what CEGUI version we have.
    4849
    49 #IF (WIN32)
    50 #    ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
    51 #    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
    52 #ELSE (WIN32)
    53 #    IF (${CEGUI_VERSION} LESS 0.6.0)
    54 #        ADD_SUBDIRECTORY(ceguilua-0.5.0b/ceguilua)
    55 #        INCLUDE_DIRECTORIES(ceguilua-0.5.0b)
    56 #    ELSE (${CEGUI_VERSION} LESS 0.6.0)
    57 #        ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
    58 #        INCLUDE_DIRECTORIES(ceguilua-0.6.1)
    59 #    ENDIF (${CEGUI_VERSION} LESS 0.6.0)
    60 #ENDIF (WIN32)
     50IF (WIN32)
     51    ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
     52    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
     53ELSE (WIN32)
     54    IF (${CEGUI_VERSION} LESS 0.6.0)
     55        ADD_SUBDIRECTORY(ceguilua-0.5.0b/ceguilua)
     56        INCLUDE_DIRECTORIES(ceguilua-0.5.0b)
     57    ELSE (${CEGUI_VERSION} LESS 0.6.0)
     58        ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
     59        INCLUDE_DIRECTORIES(ceguilua-0.6.1)
     60    ENDIF (${CEGUI_VERSION} LESS 0.6.0)
     61ENDIF (WIN32)
    6162
    6263# Our own libraries
  • code/branches/buildsystem/src/ceguilua-0.5.0b/ceguilua/CEGUILua.cpp

    r1832 r1979  
    3535
    3636// include Lua libs and tolua++
    37 #include "lua/lua.hpp"
    38 #include "tolua/tolua++.h"
     37#include "lua.hpp"
     38#include "tolua++.h"
    3939
    4040// prototype for bindings initialisation function
  • code/branches/buildsystem/src/ceguilua-0.5.0b/ceguilua/CEGUILuaFunctor.cpp

    r1810 r1979  
    3434
    3535// include Lua libs and tolua++
    36 #include "lua/lua.hpp"
    37 #include "tolua/tolua++.h"
     36#include "lua.hpp"
     37#include "tolua++.h"
    3838
    3939// Start of CEGUI namespace section
  • code/branches/buildsystem/src/ceguilua-0.5.0b/ceguilua/CMakeLists.txt

    r1884 r1979  
    99
    1010TARGET_LINK_LIBRARIES(ceguilua_orxonox
    11   lua_orxonox
    1211  tolualib_orxonox
     12  ${LUA_LIBRARIES}
    1313  ${CEGUI_LIBRARIES}
    1414)
  • code/branches/buildsystem/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt

    r1884 r1979  
    99
    1010TARGET_LINK_LIBRARIES(ceguilua_orxonox
    11   lua_orxonox
    1211  tolualib_orxonox
     12  ${LUA_LIBRARIES}
    1313  ${CEGUI_LIBRARIES}
    1414)
  • code/branches/buildsystem/src/orxonox/CMakeLists.txt

    r1978 r1979  
    9494  ${CEGUI_LIBRARIES}
    9595  ${LUA_LIBRARIES}
    96   # TODO: write include file for this
    97   CEGUILuaScriptModule
     96  #${CEGUI_SCRIPT_LIBRARIES}
     97  ceguilua_orxonox
    9898  tinyxml_orxonox
    9999  tolualib_orxonox
Note: See TracChangeset for help on using the changeset viewer.