Changeset 1804 for code/branches/ceguilua

Timestamp:

Sep 21, 2008, 5:10:08 PM (16 years ago)

Author:

rgrieder

Message:

Implemented lua and ceguilua as far as it works now with visual studio. Next (not so big) step is to integrate it in CMake (already did the most part).

Location:

code/branches/ceguilua

Files:

• CMakeLists.txt (modified) (3 diffs)
• src/CMakeLists.txt (modified) (2 diffs)
• src/ceguilua-0.5.0b/ceguilua/CMakeLists.txt (modified) (1 diff)
• src/ceguilua-0.6.1/ceguilua/CEGUILua.cpp (modified) (4 diffs)
• src/ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.cpp (modified) (1 diff)
• src/ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified) (1 diff)
• src/ceguilua-0.6.1/ceguilua/lua_CEGUI.cpp (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/Script.cc (modified) (1 diff)
• src/core/Script.h (modified) (1 diff)
• src/cpptcl/CMakeLists.txt (modified) (1 diff)
• src/lua-5.0.3/lua/lua.hpp (added)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/OrxonoxStableHeaders.h (modified) (1 diff)
• src/orxonox/gui/GUIManager.cc (modified) (2 diffs)
• src/tinyxml/CMakeLists.txt (modified) (1 diff)
• src/tolua/CMakeLists.txt (modified) (4 diffs)
• src/tolua/lua/package.lua (modified) (1 diff)
• src/tolua/tolua++.h (modified) (1 diff)
• src/tolua/tolua.c (modified) (1 diff)
• src/tolua/tolua_is.c (modified) (1 diff)
• src/tolua/tolua_map.c (modified) (1 diff)
• src/tolua/tolua_push.c (modified) (1 diff)
• visual_studio/base_properties.vsprops (modified) (1 diff)
• visual_studio/ceguilua_properties.vsprops (added)
• visual_studio/core_properties.vsprops (modified) (1 diff)
• visual_studio/lua_properties.vsprops (added)
• visual_studio/orxonox_properties.vsprops (modified) (1 diff)
• visual_studio/orxonox_vc8.sln (modified) (5 diffs)
• visual_studio/tolua_app_properties.vsprops (modified) (1 diff)
• visual_studio/tolua_gen_properties.vsprops (modified) (1 diff)
• visual_studio/tolua_properties.vsprops (modified) (1 diff)
• visual_studio/vc8/ceguilua.vcproj (added)
• visual_studio/vc8/core.vcproj (modified) (1 diff)
• visual_studio/vc8/lua.vcproj (added)

code/branches/ceguilua/CMakeLists.txt

@@ -78 +78 @@
 FIND_PACKAGE(OggVorbis)
 FIND_PACKAGE(ZLIB)
-FIND_PACKAGE(Lua)
+#FIND_PACKAGE(Lua)
 FIND_PACKAGE(TCL)
 FIND_PACKAGE(DirectX)
@@ -86 +86 @@
   ${OGRE_LIB_DIR}
   ${CEGUI_LIB_DIR}
-  ${CEGUI_SCRIPT_LIB_DIR}
+#  ${CEGUI_SCRIPT_LIB_DIR}
 #  ${CEGUI_OGRE_LIB_DIR}
   ${ENet_LIBRARY}
@@ -105 +105 @@
   ${VORBIS_INCLUDE_DIR}
   ${OGG_INCLUDE_DIR}
-  ${Lua_INCLUDE_DIR}
+#  ${Lua_INCLUDE_DIR}
   ${TCL_INCLUDE_PATH}
   ${DirectX_INCLUDE_DIR}

code/branches/ceguilua/src/CMakeLists.txt

@@ -2 +2 @@
 INCLUDE_DIRECTORIES(..)
 INCLUDE_DIRECTORIES(orxonox)
-INCLUDE_DIRECTORIES(tolua)
+#INCLUDE_DIRECTORIES(tolua)
 
 ADD_SUBDIRECTORY(cpptcl)
 ADD_SUBDIRECTORY(ois)
 ADD_SUBDIRECTORY(tinyxml)
+
+# This section deals with Lua version problems because CEGUILua scripting
+# module for CEGUI also uses Lua, but maybe with a different version.
+# So first, find out what CEGUI version we have.
+
+
 ADD_SUBDIRECTORY(tolua)
 
@@ -14 +20 @@
 ADD_SUBDIRECTORY(network)
 ADD_SUBDIRECTORY(orxonox)
-
-# This section deals with Lua version problems because CEGUILua scripting
-# module for CEGUI also uses Lua, but maybe with a different version.
-# So first, find out what CEGUI version we have.

code/branches/ceguilua/src/ceguilua-0.5.0b/ceguilua/CMakeLists.txt

@@ -9 +9 @@
 
 ADD_LIBRARY( ceguilua_orxonox SHARED ${LUA_SRC_FILES} )
+
+TARGET_LINK_LIBRARIES( ceguilua_orxonox lua_orxonox )

code/branches/ceguilua/src/ceguilua-0.6.1/ceguilua/CEGUILua.cpp

@@ -28 +28 @@
  *   OTHER DEALINGS IN THE SOFTWARE.
  ***************************************************************************/
-#ifdef HAVE_CONFIG_H
-#   include "config.h"
-#endif
 
 #include "CEGUI.h"
@@ -40 +37 @@
 
 // include Lua libs and tolua++
-extern "C" {
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-}
-
-#include "tolua++.h"
+#include "lua/lua.hpp"
+#include "tolua/tolua++.h"
 
 // prototype for bindings initialisation function
@@ -61 +53 @@
 LuaScriptModule::LuaScriptModule()
 {
-    #if CEGUI_LUA_VER >= 51
-        static const luaL_Reg lualibs[] = {
-            {"", luaopen_base},
-            {LUA_LOADLIBNAME, luaopen_package},
-            {LUA_TABLIBNAME, luaopen_table},
-            {LUA_IOLIBNAME, luaopen_io},
-            {LUA_OSLIBNAME, luaopen_os},
-            {LUA_STRLIBNAME, luaopen_string},
-            {LUA_MATHLIBNAME, luaopen_math},
-        #if defined(DEBUG) || defined (_DEBUG)
-                {LUA_DBLIBNAME, luaopen_debug},
-        #endif
-            {0, 0}
-        };
-    #endif /* CEGUI_LUA_VER >= 51 */
+    static const luaL_Reg lualibs[] = {
+        {"", luaopen_base},
+        {LUA_LOADLIBNAME, luaopen_package},
+        {LUA_TABLIBNAME, luaopen_table},
+        {LUA_IOLIBNAME, luaopen_io},
+        {LUA_OSLIBNAME, luaopen_os},
+        {LUA_STRLIBNAME, luaopen_string},
+        {LUA_MATHLIBNAME, luaopen_math},
+    #if defined(DEBUG) || defined (_DEBUG)
+        {LUA_DBLIBNAME, luaopen_debug},
+    #endif
+        {0, 0}
+    };
 
     // create a lua state
@@ -82 +72 @@
 
     // init all standard libraries
-    #if CEGUI_LUA_VER >= 51
-            const luaL_Reg *lib = lualibs;
-            for (; lib->func; lib++)
-            {
-                lua_pushcfunction(d_state, lib->func);
-                lua_pushstring(d_state, lib->name);
-                lua_call(d_state, 1, 0);
-            }
-    #else /* CEGUI_LUA_VER >= 51 */
-        luaopen_base(d_state);
-        luaopen_io(d_state);
-        luaopen_string(d_state);
-        luaopen_table(d_state);
-        luaopen_math(d_state);
-        #if defined(DEBUG) || defined (_DEBUG)
-            luaopen_debug(d_state);
-        #endif
-    #endif /* CEGUI_LUA_VER >= 51 */
+    const luaL_Reg *lib = lualibs;
+    for (; lib->func; lib++)
+    {
+        lua_pushcfunction(d_state, lib->func);
+        lua_pushstring(d_state, lib->name);
+        lua_call(d_state, 1, 0);
+    }
 
     setModuleIdentifierString();

code/branches/ceguilua/src/ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.cpp

@@ -34 +34 @@
 
 // include Lua libs and tolua++
-extern "C" {
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-}
-
-#include "tolua++.h"
+#include "lua/lua.hpp"
+#include "tolua/tolua++.h"
 
 // Start of CEGUI namespace section

code/branches/ceguilua/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt

@@ -9 +9 @@
 
 ADD_LIBRARY( ceguilua_orxonox SHARED ${LUA_SRC_FILES} )
+
+TARGET_LINK_LIBRARIES( ceguilua_orxonox lua_orxonox )

code/branches/ceguilua/src/ceguilua-0.6.1/ceguilua/lua_CEGUI.cpp

@@ -9 +9 @@
 #include "string.h"
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 
 /* Exported function */

code/branches/ceguilua/src/core/CMakeLists.txt

@@ -65 +65 @@
 
 TARGET_LINK_LIBRARIES(core
-  ${Lua_LIBRARIES}
   ${OGRE_LIBRARIES}
-  cpptcl
+  lua_orxonox
+  cpptcl_orxonox
   ois_orxonox
-  tinyxml
-  tolualib
+  tinyxml_orxonox
+  tolualib_orxonox
   util
   ${Boost_thread_LIBRARIES}

code/branches/ceguilua/src/core/Script.cc

@@ -34 +34 @@
 #include "CoreIncludes.h"
 
-extern "C" {
-#include <lualib.h>
-#include <lauxlib.h>
-}
+#include "lua/lua.hpp"
 
 #include "tolua/tolua++.h"

code/branches/ceguilua/src/core/Script.h

@@ -39 +39 @@
 
 extern "C" {
-#include <lua.h>
+#include "lua/lua.h"
 }
 

code/branches/ceguilua/src/cpptcl/CMakeLists.txt

@@ -1 @@
-ADD_LIBRARY(cpptcl SHARED CppTcl.cc)
+ADD_LIBRARY(cpptcl_orxonox SHARED CppTcl.cc)
 
-TARGET_LINK_LIBRARIES(cpptcl
+TARGET_LINK_LIBRARIES(cpptcl_orxonox
   ${TCL_LIBRARY}
 )

code/branches/ceguilua/src/orxonox/CMakeLists.txt

@@ -97 +97 @@
 TARGET_LINK_LIBRARIES( orxonox
   ${OGRE_LIBRARIES}
-  ${Lua_LIBRARIES}
   ${CEGUI_LIBRARIES}
   ${CEGUI_SCRIPT_LIBRARIES}
-  tinyxml
-  tolualib
+  lua_orxonox
+  tinyxml_orxonox
+  tolualib_orxonox
   ois_orxonox
   util

code/branches/ceguilua/src/orxonox/OrxonoxStableHeaders.h

@@ -37 +37 @@
 #include "util/OrxonoxPlatform.h"
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH) && 0
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH)
 
 // including std headers here is useless since they're already precompiled

code/branches/ceguilua/src/orxonox/gui/GUIManager.cc

@@ -39 +39 @@
 #include <OgreRoot.h>
 #include <CEGUI.h>
-#include <CEGUILua.h>
+#include "ceguilua/CEGUILua.h"
 #include "util/Exception.h"
 #include "core/input/InputManager.h"
@@ -50 +50 @@
 #include "OgreCEGUIRenderer.h"
 
-extern "C" {
-#include <lualib.h>
-#include <lauxlib.h>
-}
+#include "lua/lua.hpp"
 
 namespace orxonox

code/branches/ceguilua/src/tinyxml/CMakeLists.txt

@@ -7 +7 @@
 )
 
-ADD_LIBRARY(tinyxml SHARED ${TINYXML_SRC_FILES})
+ADD_LIBRARY(tinyxml_orxonox SHARED ${TINYXML_SRC_FILES})

code/branches/ceguilua/src/tolua/CMakeLists.txt

@@ -7 +7 @@
 )
 
-ADD_LIBRARY (tolualib SHARED ${TOLUALIB_SRC_FILES})
+ADD_LIBRARY (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
 
-TARGET_LINK_LIBRARIES (tolualib
-  ${Lua_LIBRARIES}
+TARGET_LINK_LIBRARIES (tolualib_orxonox
+  lua_orxonox
 )
 
@@ -19 +19 @@
 )
 
-ADD_EXECUTABLE (toluagen ${TOLUAGEN_SRC_FILES})
+ADD_EXECUTABLE (toluagen_orxonox ${TOLUAGEN_SRC_FILES})
 
-TARGET_LINK_LIBRARIES (toluagen
-  ${Lua_LIBRARIES}
-  tolualib
+TARGET_LINK_LIBRARIES (toluagen_orxonox
+  lua_orxonox
+  tolualib_orxonox
   m
 )
@@ -34 +34 @@
 ENDIF (Lua_VERSION EQUAL 5.0)
 
-GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen LOCATION)
+GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/toluabind_orxonox.c
   COMMAND ${TOLUAGEN_EXE} -n tolua -o ../../src/tolua/toluabind_orxonox.c -H ../../src/tolua/toluabind_orxonox.h ${TOLUA_PACKAGE}
-  DEPENDS toluagen
+  DEPENDS toluagen_orxonox
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )
@@ -47 +47 @@
 )
 
-ADD_EXECUTABLE (tolua ${TOLUAEXE_SRC_FILES})
+ADD_EXECUTABLE (tolua_orxonox ${TOLUAEXE_SRC_FILES})
 
-TARGET_LINK_LIBRARIES (tolua
-  ${Lua_LIBRARIES}
-  tolualib
+TARGET_LINK_LIBRARIES (tolua_orxonox
+  lua_orxonox
+  tolualib_orxonox
   m
 )

code/branches/ceguilua/src/tolua/lua/package.lua

@@ -116 +116 @@
         output('#endif\n')
         output('#include "string.h"\n\n')
- output('#include "tolua++.h"\n\n')
+ output('#include "tolua/tolua++.h"\n\n')
 
  if not flags.h then

code/branches/ceguilua/src/tolua/tolua++.h

@@ -65 +65 @@
 typedef int lua_Object;
 
-#include "lua.h"
-#include "lauxlib.h"
+#include "lua/lua.h"
+#include "lua/lauxlib.h"
 
 struct tolua_Error

code/branches/ceguilua/src/tolua/tolua.c

@@ -15 +15 @@
 #include "tolua++.h"
 
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
+#include "lua/lua.h"
+#include "lua/lualib.h"
+#include "lua/lauxlib.h"
 
 #include <stdio.h>

code/branches/ceguilua/src/tolua/tolua_is.c

@@ -14 +14 @@
 
 #include "tolua++.h"
-#include "lauxlib.h"
+#include "lua/lauxlib.h"
 
 #include <stdlib.h>

code/branches/ceguilua/src/tolua/tolua_map.c

@@ -15 +15 @@
 #include "tolua++.h"
 #include "tolua_event.h"
-#include "lauxlib.h"
+#include "lua/lauxlib.h"
 
 #include <string.h>

code/branches/ceguilua/src/tolua/tolua_push.c

@@ -14 +14 @@
 
 #include "tolua++.h"
-#include "lauxlib.h"
+#include "lua/lauxlib.h"
 
 #include <stdlib.h>

code/branches/ceguilua/visual_studio/base_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                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;"
-                PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB; ZLIB_WINAPI"
+                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;"
+                PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI;LUA_BUILD_AS_DLL"
                 WarningLevel="3"
                 DisableSpecificWarnings="4522;4251;4800"

code/branches/ceguilua/visual_studio/core_properties.vsprops

@@ -13 +13 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib lua-5.1.3$(CS).lib"
+                AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib"
         />
 </VisualStudioPropertySheet>

code/branches/ceguilua/visual_studio/orxonox_properties.vsprops

@@ -15 +15 @@
         <Tool
                 Name="VCLinkerTool"
-                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"
+                AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib enet-1.2$(CS).lib zlib-1.2.3$(CS).lib CEGUIBase$(CS).lib"
                 OutputFile="$(OutDir)$(ProjectName)$(CS).exe"
-                IgnoreDefaultLibraryNames="LIBCMT;LIBCMTD"
+                IgnoreDefaultLibraryNames=""
         />
 </VisualStudioPropertySheet>

code/branches/ceguilua/visual_studio/orxonox_vc8.sln

@@ -9 +9 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "vc8\tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}"
+        ProjectSection(ProjectDependencies) = postProject
+                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
+        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua_gen", "vc8\tolua_gen.vcproj", "{71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}"
         ProjectSection(ProjectDependencies) = postProject
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
+                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
         EndProjectSection
 EndProject
@@ -18 +22 @@
         ProjectSection(ProjectDependencies) = postProject
                 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}
+                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
         EndProjectSection
@@ -25 +30 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "vc8\core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}"
         ProjectSection(ProjectDependencies) = postProject
+                {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
+                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
+                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
+                {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}
+                {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E}
+                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
-                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
-                {9CC704CB-4956-4479-BDEC-57CBC03F700E} = {9CC704CB-4956-4479-BDEC-57CBC03F700E}
-                {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}
-                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
         EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "vc8\audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}"
         ProjectSection(ProjectDependencies) = postProject
+                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
                 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
-                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
         EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "vc8\network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}"
         ProjectSection(ProjectDependencies) = postProject
+                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
                 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
-                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
         EndProjectSection
 EndProject
@@ -47 +54 @@
         ProjectSection(ProjectDependencies) = postProject
                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
+                {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
+                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
+                {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}
+                {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
+                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
+                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
-                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
-                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
-                {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
-                {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}
+                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "vc8\lua.vcproj", "{63B3E57A-4382-42F3-85EC-E869CFCCA88F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ceguilua", "vc8\ceguilua.vcproj", "{4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}"
+        ProjectSection(ProjectDependencies) = postProject
+                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
+                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
         EndProjectSection
 EndProject
@@ -104 +122 @@
                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32
                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32
+                {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.ActiveCfg = Debug|Win32
+                {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.Build.0 = Debug|Win32
+                {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Release|Win32.ActiveCfg = Release|Win32
+                {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Release|Win32.Build.0 = Release|Win32
+                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}.Debug|Win32.ActiveCfg = Debug|Win32
+                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}.Debug|Win32.Build.0 = Debug|Win32
+                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}.Release|Win32.ActiveCfg = Release|Win32
+                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

code/branches/ceguilua/visual_studio/tolua_app_properties.vsprops

@@ -13 +13 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="lua-5.1.3$(CS).lib"
                 OutputFile="$(OutDir)$(ProjectName)$(CS).exe"
         />

code/branches/ceguilua/visual_studio/tolua_gen_properties.vsprops

@@ -12 +12 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="lua-5.1.3$(CS).lib"
                 OutputFile="$(OutDir)$(ProjectName)$(CS).exe"
         />

code/branches/ceguilua/visual_studio/tolua_properties.vsprops

@@ -9 +9 @@
                 Name="VCCLCompilerTool"
                 PreprocessorDefinitions="TOLUA_SHARED_BUILD"
-                CompileAs="2"
+                CompileAs="1"
                 DisableSpecificWarnings="4996"
         />
-        <Tool
-                Name="VCLinkerTool"
-                AdditionalDependencies="lua-5.1.3$(CS).lib"
-        />
 </VisualStudioPropertySheet>

code/branches/ceguilua/visual_studio/vc8/core.vcproj

@@ -208 +208 @@
                                                         Description="Generating tolua bind files..."
                                                         CommandLine=""$(OutDir)\tolua_app.exe" -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
"
+                                                        AdditionalDependencies=""
                                                         Outputs="$(RootDir)\src\core\tolua\tolua_bind.cc; $(RootDir)\src\core\tolua\tolua_bind.h"
                                                 />