Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1810 for code/trunk/src


Ignore:
Timestamp:
Sep 21, 2008, 8:44:25 PM (16 years ago)
Author:
rgrieder
Message:

merged ceguilua branch back to trunk

Location:
code/trunk
Files:
1 deleted
20 edited
82 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/CMakeLists.txt

    r1555 r1810  
    22INCLUDE_DIRECTORIES(..)
    33INCLUDE_DIRECTORIES(orxonox)
    4 INCLUDE_DIRECTORIES(tolua)
    54
    65ADD_SUBDIRECTORY(cpptcl)
    76ADD_SUBDIRECTORY(ois)
    87ADD_SUBDIRECTORY(tinyxml)
     8ADD_SUBDIRECTORY(lua)
    99ADD_SUBDIRECTORY(tolua)
    1010
     11# Some people may not have CEGUILua installed, espc. with version 0.5
     12# And we don't know what lua version it was linked against, so we compile
     13# it ourselves.
     14# So first, find out what CEGUI version we have.
     15IF (${CEGUI_VERSION} LESS 0.6.0)
     16    ADD_SUBDIRECTORY(ceguilua-0.5.0b)
     17    INCLUDE_DIRECTORIES(ceguilua-0.5.0b)
     18ELSE (${CEGUI_VERSION} LESS 0.6.0)
     19    ADD_SUBDIRECTORY(ceguilua-0.6.1)
     20    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
     21ENDIF (${CEGUI_VERSION} LESS 0.6.0)
     22
     23
     24# Our own libraries
    1125ADD_SUBDIRECTORY(util)
    1226ADD_SUBDIRECTORY(core)

  • code/trunk/src/core/CMakeLists.txt

    r1764 r1810  
    5454)
    5555
    56 GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
     56GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
    5757ADD_CUSTOM_COMMAND(
    5858  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
    … …  
    6565
    6666TARGET_LINK_LIBRARIES(core
    67   ${Lua_LIBRARIES}
    6867  ${OGRE_LIBRARIES}
    69   cpptcl
     68  lua_orxonox
     69  cpptcl_orxonox
    7070  ois_orxonox
    71   tinyxml
    72   tolualib
     71  tinyxml_orxonox
     72  tolualib_orxonox
    7373  util
    7474  ${Boost_thread_LIBRARIES}

  • code/trunk/src/core/Script.cc

    r1755 r1810  
    3434#include "CoreIncludes.h"
    3535
    36 extern "C" {
    37 #include <lualib.h>
    38 #include <lauxlib.h>
    39 }
     36#include "lua/lua.hpp"
    4037
    4138#include "tolua/tolua++.h"

  • code/trunk/src/core/Script.h

    r1755 r1810  
    3939
    4040extern "C" {
    41 #include <lua.h>
     41#include "lua/lua.h"
    4242}
    4343

  • code/trunk/src/cpptcl/CMakeLists.txt

    r1505 r1810  
    1 ADD_LIBRARY(cpptcl SHARED CppTcl.cc)
     1ADD_LIBRARY(cpptcl_orxonox SHARED CppTcl.cc)
    22
    3 TARGET_LINK_LIBRARIES(cpptcl
     3TARGET_LINK_LIBRARIES(cpptcl_orxonox
    44  ${TCL_LIBRARY}
    55)

  • code/trunk/src/orxonox/CMakeLists.txt

    r1755 r1810  
    6666)
    6767
    68 GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
     68GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
    6969ADD_CUSTOM_COMMAND(
    7070  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
    … …  
    9797TARGET_LINK_LIBRARIES( orxonox
    9898  ${OGRE_LIBRARIES}
    99   ${Lua_LIBRARIES}
    10099  ${CEGUI_LIBRARIES}
    101   ${CEGUI_SCRIPT_LIBRARIES}
    102   tinyxml
    103   tolualib
     100  lua_orxonox
     101  ceguilua_orxonox
     102  tinyxml_orxonox
     103  tolualib_orxonox
    104104  ois_orxonox
    105105  util

  • code/trunk/src/orxonox/OrxonoxStableHeaders.h

    r1781 r1810  
    3737#include "util/OrxonoxPlatform.h"
    3838
    39 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH) && 0
     39#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH)
    4040
    4141// including std headers here is useless since they're already precompiled

  • code/trunk/src/orxonox/gui/GUIManager.cc

    r1776 r1810  
    3939#include <OgreRoot.h>
    4040#include <CEGUI.h>
    41 #include <CEGUILua.h>
     41#include "ceguilua/CEGUILua.h"
    4242#include "util/Exception.h"
    4343#include "core/input/InputManager.h"
    … …  
    5050#include "OgreCEGUIRenderer.h"
    5151
    52 extern "C" {
    53 #include <lualib.h>
    54 #include <lauxlib.h>
    55 }
     52#include "lua/lua.hpp"
    5653
    5754namespace orxonox

  • code/trunk/src/tinyxml/CMakeLists.txt

    r1505 r1810  
    77)
    88
    9 ADD_LIBRARY(tinyxml SHARED ${TINYXML_SRC_FILES})
     9ADD_LIBRARY(tinyxml_orxonox SHARED ${TINYXML_SRC_FILES})

  • code/trunk/src/tolua/CMakeLists.txt

    r1755 r1810  
    77)
    88
    9 ADD_LIBRARY (tolualib SHARED ${TOLUALIB_SRC_FILES})
     9ADD_LIBRARY (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
    1010
    11 TARGET_LINK_LIBRARIES (tolualib
    12   ${Lua_LIBRARIES}
     11TARGET_LINK_LIBRARIES (tolualib_orxonox
     12  lua_orxonox
    1313)
    1414
    … …  
    1919)
    2020
    21 ADD_EXECUTABLE (toluagen ${TOLUAGEN_SRC_FILES})
     21ADD_EXECUTABLE (toluagen_orxonox ${TOLUAGEN_SRC_FILES})
    2222
    23 TARGET_LINK_LIBRARIES (toluagen
    24   ${Lua_LIBRARIES}
    25   tolualib
     23TARGET_LINK_LIBRARIES (toluagen_orxonox
     24  lua_orxonox
     25  tolualib_orxonox
    2626  m
    2727)
    2828
    2929
    30 IF (Lua_VERSION EQUAL 5.0)
    31   SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.0.pkg")
    32 ELSE (Lua_VERSION EQUAL 5.0)
    33   SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.1.pkg")
    34 ENDIF (Lua_VERSION EQUAL 5.0)
    35 
    36 GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen LOCATION)
     30SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.1.pkg")
     31GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen_orxonox LOCATION)
    3732ADD_CUSTOM_COMMAND(
    3833  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/toluabind_orxonox.c
    3934  COMMAND ${TOLUAGEN_EXE} -n tolua -o ../../src/tolua/toluabind_orxonox.c -H ../../src/tolua/toluabind_orxonox.h ${TOLUA_PACKAGE}
    40   DEPENDS toluagen
     35  DEPENDS toluagen_orxonox
    4136  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
    4237)
    … …  
    4742)
    4843
    49 ADD_EXECUTABLE (tolua ${TOLUAEXE_SRC_FILES})
     44ADD_EXECUTABLE (tolua_orxonox ${TOLUAEXE_SRC_FILES})
    5045
    51 TARGET_LINK_LIBRARIES (tolua
    52   ${Lua_LIBRARIES}
    53   tolualib
     46TARGET_LINK_LIBRARIES (tolua_orxonox
     47  lua_orxonox
     48  tolualib_orxonox
    5449  m
    5550)

  • code/trunk/src/tolua/lua/package.lua

    r1755 r1810  
    116116        output('#endif\n')
    117117        output('#include "string.h"\n\n')
    118  output('#include "tolua++.h"\n\n')
     118 output('#include "tolua/tolua++.h"\n\n')
    119119
    120120 if not flags.h then

  • code/trunk/src/tolua/tolua++.h

    r1755 r1810  
    6565typedef int lua_Object;
    6666
    67 #include "lua.h"
    68 #include "lauxlib.h"
     67#include "lua/lua.h"
     68#include "lua/lauxlib.h"
    6969
    7070struct tolua_Error

  • code/trunk/src/tolua/tolua-5.1.pkg

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/trunk/src/tolua/tolua.c

    r1505 r1810  
    1515#include "tolua++.h"
    1616
    17 #include "lua.h"
    18 #include "lualib.h"
    19 #include "lauxlib.h"
     17#include "lua/lua.h"
     18#include "lua/lualib.h"
     19#include "lua/lauxlib.h"
    2020
    2121#include <stdio.h>

  • code/trunk/src/tolua/tolua_is.c

    r1505 r1810  
    1414
    1515#include "tolua++.h"
    16 #include "lauxlib.h"
     16#include "lua/lauxlib.h"
    1717
    1818#include <stdlib.h>

  • code/trunk/src/tolua/tolua_map.c

    r1505 r1810  
    1515#include "tolua++.h"
    1616#include "tolua_event.h"
    17 #include "lauxlib.h"
     17#include "lua/lauxlib.h"
    1818
    1919#include <string.h>

  • code/trunk/src/tolua/tolua_push.c

    r1505 r1810  
    1414
    1515#include "tolua++.h"
    16 #include "lauxlib.h"
     16#include "lua/lauxlib.h"
    1717
    1818#include <stdlib.h>

  • code/trunk/src/util/Exception.cc

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/trunk/src/util/Exception.h

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.