Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1975


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

lua removed and using extern one

Location:
code/branches/buildsystem
Files:
2 added
57 deleted
13 edited

Legend:

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

    r1886 r1975  
    100100FIND_PACKAGE(OggVorbis)
    101101FIND_PACKAGE(ZLIB)
    102 #FIND_PACKAGE(Lua)
     102FIND_PACKAGE(Lua50)
    103103FIND_PACKAGE(TCL)
    104104FIND_PACKAGE(DirectX)
  • code/branches/buildsystem/src/CMakeLists.txt

    r1885 r1975  
    33INCLUDE_DIRECTORIES(ois) # for ois library subfolders
    44INCLUDE_DIRECTORIES(orxonox)
    5 INCLUDE_DIRECTORIES(lua) # for tolua library and generator
     5#INCLUDE_DIRECTORIES(lua) # for tolua library and generator
     6INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
    67
    78ADD_SUBDIRECTORY(cpptcl)
    89ADD_SUBDIRECTORY(ois)
    910ADD_SUBDIRECTORY(tinyxml)
    10 ADD_SUBDIRECTORY(lua)
     11#ADD_SUBDIRECTORY(lua)
    1112ADD_SUBDIRECTORY(tolua)
    1213
     
    1617# So first, find out what CEGUI version we have.
    1718
    18 IF (WIN32)
    19     ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
    20     INCLUDE_DIRECTORIES(ceguilua-0.6.1)
    21 ELSE (WIN32)
    22     IF (${CEGUI_VERSION} LESS 0.6.0)
    23         ADD_SUBDIRECTORY(ceguilua-0.5.0b/ceguilua)
    24         INCLUDE_DIRECTORIES(ceguilua-0.5.0b)
    25     ELSE (${CEGUI_VERSION} LESS 0.6.0)
    26         ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
    27         INCLUDE_DIRECTORIES(ceguilua-0.6.1)
    28     ENDIF (${CEGUI_VERSION} LESS 0.6.0)
    29 ENDIF (WIN32)
    30 
     19#IF (WIN32)
     20#    ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
     21#    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
     22#ELSE (WIN32)
     23#    IF (${CEGUI_VERSION} LESS 0.6.0)
     24#        ADD_SUBDIRECTORY(ceguilua-0.5.0b/ceguilua)
     25#        INCLUDE_DIRECTORIES(ceguilua-0.5.0b)
     26#    ELSE (${CEGUI_VERSION} LESS 0.6.0)
     27#        ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
     28#        INCLUDE_DIRECTORIES(ceguilua-0.6.1)
     29#    ENDIF (${CEGUI_VERSION} LESS 0.6.0)
     30#ENDIF (WIN32)
    3131
    3232# Our own libraries
  • code/branches/buildsystem/src/core/CMakeLists.txt

    r1882 r1975  
    6161  ${Boost_thread_LIBRARIES}
    6262  ${Boost_filesystem_LIBRARIES}
    63   lua_orxonox
     63  ${LUA_LIBRARIES}
    6464  cpptcl_orxonox
    6565  ois_orxonox
  • code/branches/buildsystem/src/core/Script.cc

    r1882 r1975  
    3434#include "CoreIncludes.h"
    3535
    36 #include "lua/lua.hpp"
     36extern "C" {
     37#include "lua.h"
     38#include "lualib.h"
     39}
    3740
    3841#include "tolua++.h"
  • code/branches/buildsystem/src/core/Script.h

    r1810 r1975  
    3939
    4040extern "C" {
    41 #include "lua/lua.h"
     41#include "lua.h"
    4242}
    4343
  • code/branches/buildsystem/src/orxonox/CMakeLists.txt

    r1882 r1975  
    9797  ${OGRE_LIBRARIES}
    9898  ${CEGUI_LIBRARIES}
    99   lua_orxonox
    100   ceguilua_orxonox
     99  ${LUA_LIBRARIES}
     100  CEGUILuaScriptModule
    101101  tinyxml_orxonox
    102102  tolualib_orxonox
  • code/branches/buildsystem/src/orxonox/gui/GUIManager.cc

    r1882 r1975  
    3939#include <OgreRoot.h>
    4040#include <CEGUI.h>
    41 #include "ceguilua/CEGUILua.h"
     41#include <CEGUILua.h>
    4242#include "util/Exception.h"
    4343#include "core/input/InputManager.h"
     
    5050#include "OgreCEGUIRenderer.h"
    5151
    52 #include "lua/lua.hpp"
     52extern "C" {
     53#include "lua.h"
     54}
    5355
    5456namespace orxonox
  • code/branches/buildsystem/src/tolua/CMakeLists.txt

    r1882 r1975  
     1# TODO: only build the object files once
     2
    13SET (TOLUALIB_SRC_FILES
    24  tolua_event.c
     
    810
    911ADD_LIBRARY (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
    10 
    11 TARGET_LINK_LIBRARIES (tolualib_orxonox
    12   lua_orxonox
    13 )
    14 
     12TARGET_LINK_LIBRARIES (tolualib_orxonox ${LUA_LIBRARIES})
    1513
    1614SET (TOLUAGEN_SRC_FILES
     
    1917)
    2018
    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 
     19ADD_EXECUTABLE (toluagen_orxonox ${TOLUAGEN_SRC_FILES} ${TOLUALIB_SRC_FILES})
     20TARGET_LINK_LIBRARIES (toluagen_orxonox ${LUA_LIBRARIES})
    2921
    3022SET (TOLUA_PACKAGE "${CMAKE_CURRENT_SOURCE_DIR}/tolua-5.1.pkg")
     
    6557)
    6658
    67 ADD_EXECUTABLE (tolua_orxonox ${TOLUAEXE_SRC_FILES})
    68 
    69 TARGET_LINK_LIBRARIES (tolua_orxonox
    70   lua_orxonox
    71   tolualib_orxonox
    72   m
    73 )
     59ADD_EXECUTABLE (tolua_orxonox ${TOLUAEXE_SRC_FILES} ${TOLUALIB_SRC_FILES})
     60TARGET_LINK_LIBRARIES (tolua_orxonox ${LUA_LIBRARIES})
  • code/branches/buildsystem/src/tolua/tolua++.h

    r1810 r1975  
    6565typedef int lua_Object;
    6666
    67 #include "lua/lua.h"
    68 #include "lua/lauxlib.h"
     67#include "lua.h"
     68#include "lauxlib.h"
    6969
    7070struct tolua_Error
  • code/branches/buildsystem/src/tolua/tolua.c

    r1810 r1975  
    1515#include "tolua++.h"
    1616
    17 #include "lua/lua.h"
    18 #include "lua/lualib.h"
    19 #include "lua/lauxlib.h"
     17#include "lua.h"
     18#include "lualib.h"
     19#include "lauxlib.h"
    2020
    2121#include <stdio.h>
  • code/branches/buildsystem/src/tolua/tolua_is.c

    r1810 r1975  
    1414
    1515#include "tolua++.h"
    16 #include "lua/lauxlib.h"
     16#include "lauxlib.h"
    1717
    1818#include <stdlib.h>
  • code/branches/buildsystem/src/tolua/tolua_map.c

    r1810 r1975  
    1515#include "tolua++.h"
    1616#include "tolua_event.h"
    17 #include "lua/lauxlib.h"
     17#include "lauxlib.h"
    1818
    1919#include <string.h>
  • code/branches/buildsystem/src/tolua/tolua_push.c

    r1810 r1975  
    1414
    1515#include "tolua++.h"
    16 #include "lua/lauxlib.h"
     16#include "lauxlib.h"
    1717
    1818#include <stdlib.h>
Note: See TracChangeset for help on using the changeset viewer.