Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1755 for code/trunk/src/tolua


Ignore:
Timestamp:
Sep 10, 2008, 1:37:36 AM (16 years ago)
Author:
rgrieder
Message:

merged gui back to trunk.
update the media repository!

Location:
code/trunk
Files:
4 edited
28 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

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

    r1582 r1755  
    1313)
    1414
     15
     16SET (TOLUAGEN_SRC_FILES
     17  tolua.c
     18  toluabind.c
     19)
     20
     21ADD_EXECUTABLE (toluagen ${TOLUAGEN_SRC_FILES})
     22
     23TARGET_LINK_LIBRARIES (toluagen
     24  ${Lua_LIBRARIES}
     25  tolualib
     26  m
     27)
     28
     29
     30IF (Lua_VERSION EQUAL 5.0)
     31  SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.0.pkg")
     32ELSE (Lua_VERSION EQUAL 5.0)
     33  SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.1.pkg")
     34ENDIF (Lua_VERSION EQUAL 5.0)
     35
     36GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen LOCATION)
     37ADD_CUSTOM_COMMAND(
     38  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/toluabind_orxonox.c
     39  COMMAND ${TOLUAGEN_EXE} -n tolua -o ../../src/tolua/toluabind_orxonox.c -H ../../src/tolua/toluabind_orxonox.h ${TOLUA_PACKAGE}
     40  DEPENDS toluagen
     41  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
     42)
     43
    1544SET (TOLUAEXE_SRC_FILES
    1645  tolua.c
    17   toluabind.c
     46  toluabind_orxonox.c
    1847)
    1948

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

    r1505 r1755  
    1717#define TOLUA_H
    1818
     19/* original code */
     20/*
    1921#ifndef TOLUA_API
    2022#define TOLUA_API extern
    2123#endif
     24*/
     25
     26/********************************
     27******* ORXONOX CHANGES *********
     28********************************/
     29
     30#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined( TOLUA_STATIC_BUILD )
     31#  ifdef TOLUA_SHARED_BUILD
     32#    define TOLUA_API __declspec(dllexport)
     33#  else
     34#    if defined( __MINGW32__ )
     35#      define TOLUA_API
     36#    else
     37#      define TOLUA_API __declspec(dllimport)
     38#    endif
     39#  endif
     40#else
     41#  define TOLUA_API extern
     42#endif
     43
     44/********************************
     45****** END ORXONOX CHANGES ******
     46********************************/
    2247
    2348#define TOLUA_VERSION "tolua++-1.0.92"

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

    r1505 r1755  
    1212
    1313/* Exported function */
    14 TOLUA_API int  tolua_tolua_open (lua_State* tolua_S);
     14int  tolua_tolua_open (lua_State* tolua_S);
    1515
    1616
    … …  
    2121
    2222/* Open function */
    23 TOLUA_API int tolua_tolua_open (lua_State* tolua_S)
     23int tolua_tolua_open (lua_State* tolua_S)
    2424{
    2525 tolua_open(tolua_S);
    … …  
    76227622
    76237623#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501
    7624  TOLUA_API int luaopen_tolua (lua_State* tolua_S) {
     7624 int luaopen_tolua (lua_State* tolua_S) {
    76257625 return tolua_tolua_open(tolua_S);
    76267626};

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

    r1724 r1755  
    11/*
    22** Lua binding: tolua
    3 ** Generated automatically by tolua++-1.0.92 on 09/05/08 12:45:12.
     3** Generated automatically by tolua++-1.0.92 on 09/10/08 00:32:19.
    44*/
    55

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

    r1724 r1755  
    11/*
    22** Lua binding: tolua
    3 ** Generated automatically by tolua++-1.0.92 on 09/05/08 12:45:13.
     3** Generated automatically by tolua++-1.0.92 on 09/10/08 00:32:21.
    44*/
    55
Note: See TracChangeset for help on using the changeset viewer.