Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1810


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
30 edited
86 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/CMakeLists.txt

    r1776 r1810  
    7878FIND_PACKAGE(OggVorbis)
    7979FIND_PACKAGE(ZLIB)
    80 FIND_PACKAGE(Lua)
     80#FIND_PACKAGE(Lua)
    8181FIND_PACKAGE(TCL)
    8282FIND_PACKAGE(DirectX)
    … …  
    8686  ${OGRE_LIB_DIR}
    8787  ${CEGUI_LIB_DIR}
    88   ${CEGUI_SCRIPT_LIB_DIR}
     88#  ${CEGUI_SCRIPT_LIB_DIR}
    8989#  ${CEGUI_OGRE_LIB_DIR}
    9090  ${ENet_LIBRARY}
    … …  
    105105  ${VORBIS_INCLUDE_DIR}
    106106  ${OGG_INCLUDE_DIR}
    107   ${Lua_INCLUDE_DIR}
     107#  ${Lua_INCLUDE_DIR}
    108108  ${TCL_INCLUDE_PATH}
    109109  ${DirectX_INCLUDE_DIR}

  • code/trunk/cmake/FindCEGUI.cmake

    r1776 r1810  
    1919#                 > www.orxonox.net <
    2020
    21 IF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
     21IF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    2222    SET(CEGUI_FIND_QUIETLY TRUE) # Already in cache, be silent
    23 ENDIF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
     23ENDIF (CEGUI_LIBRARIES AND CEGUI_INCLUDE_DIR AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    2424
    2525IF (WIN32) #Windows
    … …  
    3939    ENDIF (CEGUI_LIBDIR)
    4040
    41     IF (NOT CEGUI_SCRIPT_LIBDIR)
    42         # Search Lua script module
    43         SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
    44         FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
    45             ../libs/cegui-0.6.1/bin
    46         )
    47         IF (NOT CEGUI_SCRIPT_LIBDIR)
    48             SET(CEGUI_SCRIPT_LIBRARIES "CEGUILua")
    49             FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
    50                 ../libs/cegui-0.6.1/bin
    51             )
    52             IF (NOT CEGUI_SCRIPT_LIBDIR)
    53                 SET(CEGUI_SCRIPT_LIBRARIES)
    54             ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
    55         ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
    56     ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
     41#    IF (NOT CEGUI_SCRIPT_LIBDIR)
     42#        # Search Lua script module
     43#        SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
     44#        FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
     45#            ../libs/cegui-0.6.1/bin
     46#        )
     47#       IF (NOT CEGUI_SCRIPT_LIBDIR)
     48#            SET(CEGUI_SCRIPT_LIBRARIES "CEGUILua")
     49#            FIND_LIBRARY(CEGUI_SCRIPT_LIBDIR NAMES ${CEGUI_SCRIPT_LIBRARIES} PATHS
     50#                ../libs/cegui-0.6.1/bin
     51#            )
     52#            IF (NOT CEGUI_SCRIPT_LIBDIR)
     53#                SET(CEGUI_SCRIPT_LIBRARIES)
     54#            ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
     55#        ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
     56#    ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
    5757
    58     # Strip the filename from the path
    59     IF (CEGUI_SCRIPT_LIBDIR)
    60         GET_FILENAME_COMPONENT(CEGUI_SCRIPT_LIBDIR ${CEGUI_SCRIPT_LIBDIR} PATH)
    61         SET (CEGUI_SCRIPT_LIB_DIR ${CEGUI_SCRIPT_LIBDIR} CACHE FILEPATH "")
    62     ENDIF (CEGUI_SCRIPT_LIBDIR)
     58#    # Strip the filename from the path
     59#    IF (CEGUI_SCRIPT_LIBDIR)
     60#        GET_FILENAME_COMPONENT(CEGUI_SCRIPT_LIBDIR ${CEGUI_SCRIPT_LIBDIR} PATH)
     61#        SET (CEGUI_SCRIPT_LIB_DIR ${CEGUI_SCRIPT_LIBDIR} CACHE FILEPATH "")
     62#    ENDIF (CEGUI_SCRIPT_LIBDIR)
    6363
    6464ELSE (WIN32) #Unix
    … …  
    6868    SET(CEGUI_LIB_DIR ${CEGUI_LIBDIR})
    6969    SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
    70     SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
    71     SET(CEGUI_SCRIPT_LIB_DIR)
     70#    SET(CEGUI_SCRIPT_LIBRARIES "CEGUILuaScriptModule")
     71#    SET(CEGUI_SCRIPT_LIB_DIR)
    7272ENDIF (WIN32)
    7373
    74 IF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
     74IF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    7575    SET(CEGUI_FOUND TRUE)
    7676
    … …  
    8282    SET(CEGUI_LIBRARIES ${CEGUI_LIBRARIES} CACHE STRING "")
    8383    SET(CEGUI_LIB_DIR ${CEGUI_LIB_DIR} CACHE PATH "")
    84     SET(CEGUI_SCRIPT_LIBRARIES ${CEGUI_SCRIPT_LIBRARIES} CACHE PATH "")
    85 ENDIF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR AND CEGUI_SCRIPT_LIBRARIES)
     84#    SET(CEGUI_SCRIPT_LIBRARIES ${CEGUI_SCRIPT_LIBRARIES} CACHE PATH "")
     85ENDIF (CEGUI_INCLUDE_DIR AND CEGUI_LIBRARIES AND CEGUI_LIB_DIR)# AND CEGUI_SCRIPT_LIBRARIES)
    8686
    8787IF (CEGUI_FOUND)
    … …  
    9292            MESSAGE (STATUS "  library path: ${CEGUI_LIB_DIR}")
    9393            MESSAGE (STATUS "  libraries:    ${CEGUI_LIBRARIES}")
    94             MESSAGE (STATUS "           :    ${CEGUI_SCRIPT_LIBRARIES}")
     94#            MESSAGE (STATUS "           :    ${CEGUI_SCRIPT_LIBRARIES}")
    9595        ENDIF (VERBOSE_FIND)
    9696    ENDIF (NOT CEGUI_FIND_QUIETLY)
    … …  
    105105        MESSAGE(SEND_ERROR "CEGUI libraries not known.")
    106106    ENDIF (NOT CEGUI_LIBRARIES)
    107     IF (NOT CEGUI_SCRIPT_LIBRARIES)
    108         MESSAGE(SEND_ERROR "CEGUI Lua script module was not found.")
    109     ENDIF (NOT CEGUI_SCRIPT_LIBRARIES)
     107#    IF (NOT CEGUI_SCRIPT_LIBRARIES)
     108#        MESSAGE(SEND_ERROR "CEGUI Lua script module was not found.")
     109#    ENDIF (NOT CEGUI_SCRIPT_LIBRARIES)
    110110ENDIF (CEGUI_FOUND)
    111111

  • 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)

  • code/trunk/visual_studio/base_properties.vsprops

    r1755 r1810  
    88        <Tool
    99                Name="VCCLCompilerTool"
    10                 AdditionalIncludeDirectories="&quot;$(RootDir)&quot;;&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\tolua&quot;;&quot;$(RootDir)src\ois&quot;;&quot;$(LibDir)ogre-1.4.9\OgreMain\include&quot;;&quot;$(LibDir)boost-1.35.0&quot;;&quot;$(LibDir)cegui-0.6.1\include&quot;;&quot;$(LibDir)cegui-0.6.1\ScriptingModules\CEGUILua\LuaScriptModule\include&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)lua-5.1.3\src&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)openal-1.1\alut\include&quot;;&quot;$(LibDir)tcl-8.5.\generic&quot;;&quot;$(LibDir)zlib-1.2.3&quot;"
    11                 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB; ZLIB_WINAPI"
     10                AdditionalIncludeDirectories="&quot;$(RootDir)&quot;;&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\lua-5.1.3&quot;;&quot;$(RootDir)src\ceguilua-0.6.1&quot;;&quot;$(LibDir)ogre-1.4.9\OgreMain\include&quot;;&quot;$(LibDir)boost-1.35.0&quot;;&quot;$(LibDir)cegui-0.6.1\include&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)openal-1.1\alut\include&quot;;&quot;$(LibDir)tcl-8.5.\generic&quot;;&quot;$(LibDir)zlib-1.2.3&quot;"
     11                PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI;LUA_BUILD_AS_DLL"
    1212                WarningLevel="3"
    1313                DisableSpecificWarnings="4522;4251;4800"

  • code/trunk/visual_studio/core_properties.vsprops

    r1755 r1810  
    1313        <Tool
    1414                Name="VCLinkerTool"
    15                 AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib lua-5.1.3$(CS).lib"
     15                AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib"
    1616        />
    1717</VisualStudioPropertySheet>

  • code/trunk/visual_studio/orxonox_properties.vsprops

    r1755 r1810  
    1515        <Tool
    1616                Name="VCLinkerTool"
    17                 AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib enet-1.2$(CS).lib zlib-1.2.3$(CS).lib CEGUILua$(CS).lib CEGUIBase$(CS).lib lua-5.1.3$(CS).lib"
     17                AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib enet-1.2$(CS).lib zlib-1.2.3$(CS).lib CEGUIBase$(CS).lib"
    1818                OutputFile="$(OutDir)$(ProjectName)$(CS).exe"
    19                 IgnoreDefaultLibraryNames="LIBCMT;LIBCMTD"
     19                IgnoreDefaultLibraryNames=""
    2020        />
    2121</VisualStudioPropertySheet>

  • code/trunk/visual_studio/orxonox_vc8.sln

    r1755 r1810  
    99EndProject
    1010Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "vc8\tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}"
     11        ProjectSection(ProjectDependencies) = postProject
     12                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
     13        EndProjectSection
    1114EndProject
    1215Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua_gen", "vc8\tolua_gen.vcproj", "{71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}"
    1316        ProjectSection(ProjectDependencies) = postProject
    1417                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
     18                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
    1519        EndProjectSection
    1620EndProject
    … …  
    1822        ProjectSection(ProjectDependencies) = postProject
    1923                {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}
     24                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
    2025                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
    2126        EndProjectSection
    … …  
    2530Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "vc8\core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}"
    2631        ProjectSection(ProjectDependencies) = postProject
     32                {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
     33                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
     34                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
     35                {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}
     36                {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E}
     37                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    2738                {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
    28                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    29                 {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E}
    30                 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}
    31                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
    3239        EndProjectSection
    3340EndProject
    3441Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "vc8\audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}"
    3542        ProjectSection(ProjectDependencies) = postProject
     43                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    3644                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    37                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    3845        EndProjectSection
    3946EndProject
    4047Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "vc8\network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}"
    4148        ProjectSection(ProjectDependencies) = postProject
     49                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    4250                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    43                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    4451        EndProjectSection
    4552EndProject
    … …  
    4754        ProjectSection(ProjectDependencies) = postProject
    4855                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
     56                {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
     57                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
     58                {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}
     59                {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
     60                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
     61                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    4962                {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
    50                 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    51                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    52                 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
    53                 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}
     63                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}
     64        EndProjectSection
     65EndProject
     66Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "vc8\lua.vcproj", "{63B3E57A-4382-42F3-85EC-E869CFCCA88F}"
     67EndProject
     68Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ceguilua", "vc8\ceguilua.vcproj", "{4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}"
     69        ProjectSection(ProjectDependencies) = postProject
     70                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
     71                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
    5472        EndProjectSection
    5573EndProject
    … …  
    104122                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32
    105123                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32
     124                {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.ActiveCfg = Debug|Win32
     125                {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.Build.0 = Debug|Win32
     126                {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Release|Win32.ActiveCfg = Release|Win32
     127                {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Release|Win32.Build.0 = Release|Win32
     128                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}.Debug|Win32.ActiveCfg = Debug|Win32
     129                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}.Debug|Win32.Build.0 = Debug|Win32
     130                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}.Release|Win32.ActiveCfg = Release|Win32
     131                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}.Release|Win32.Build.0 = Release|Win32
    106132        EndGlobalSection
    107133        GlobalSection(SolutionProperties) = preSolution

  • code/trunk/visual_studio/tolua_app_properties.vsprops

    r1755 r1810  
    1313        <Tool
    1414                Name="VCLinkerTool"
    15                 AdditionalDependencies="lua-5.1.3$(CS).lib"
    1615                OutputFile="$(OutDir)$(ProjectName)$(CS).exe"
    1716        />

  • code/trunk/visual_studio/tolua_gen_properties.vsprops

    r1755 r1810  
    1212        <Tool
    1313                Name="VCLinkerTool"
    14                 AdditionalDependencies="lua-5.1.3$(CS).lib"
    1514                OutputFile="$(OutDir)$(ProjectName)$(CS).exe"
    1615        />

  • code/trunk/visual_studio/tolua_properties.vsprops

    r1755 r1810  
    99                Name="VCCLCompilerTool"
    1010                PreprocessorDefinitions="TOLUA_SHARED_BUILD"
    11                 CompileAs="2"
     11                CompileAs="1"
    1212                DisableSpecificWarnings="4996"
    1313        />
    14         <Tool
    15                 Name="VCLinkerTool"
    16                 AdditionalDependencies="lua-5.1.3$(CS).lib"
    17         />
    1814</VisualStudioPropertySheet>

  • code/trunk/visual_studio/vc8/core.vcproj

    r1764 r1810  
    208208                                                        Description="Generating tolua bind files..."
    209209                                                        CommandLine="&quot;$(OutDir)\tolua_app.exe&quot; -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg&#x0D;&#x0A;"
     210                                                        AdditionalDependencies=""
    210211                                                        Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h"
    211212                                                />
Note: See TracChangeset for help on using the changeset viewer.