From ff3b10507f68b61379d0299ade466681ca015e7e Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Mon, 4 Jun 2012 14:58:17 +0000
Subject: Fixed tolua++ sources to consider AString a builtin string type.
 Fixed tolua++ VC projects for compilation with local Lua.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@551 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 tolua++-1.0.93/win32/tolualib/tolualib.vcproj |   4 +-
 tolua++-1.0.93/win32/vc7/toluapp.sln          |   9 +-
 tolua++-1.0.93/win32/vc7/toluapp.vcproj       | 398 +++++++++++++++-----------
 3 files changed, 231 insertions(+), 180 deletions(-)

(limited to 'tolua++-1.0.93/win32')

diff --git a/tolua++-1.0.93/win32/tolualib/tolualib.vcproj b/tolua++-1.0.93/win32/tolualib/tolualib.vcproj
index d7118af0e..c33f494b6 100644
--- a/tolua++-1.0.93/win32/tolualib/tolualib.vcproj
+++ b/tolua++-1.0.93/win32/tolualib/tolualib.vcproj
@@ -40,6 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="&quot;../../../lua-5.1.4/src&quot;;../../include"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -109,7 +110,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../include;&quot;C:\Program Files (x86)\Lua\5.1\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../../lua-5.1.4/src&quot;;../../include"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
@@ -126,7 +127,6 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="lua51.lib"
 				AdditionalLibraryDirectories="C:\Program Files (x86)\Lua\5.1\lib"
 			/>
 			<Tool
diff --git a/tolua++-1.0.93/win32/vc7/toluapp.sln b/tolua++-1.0.93/win32/vc7/toluapp.sln
index 2ef8458ca..e14ba57c8 100644
--- a/tolua++-1.0.93/win32/vc7/toluapp.sln
+++ b/tolua++-1.0.93/win32/vc7/toluapp.sln
@@ -1,6 +1,9 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluapp", "toluapp.vcproj", "{71891C1A-E328-4258-AC3F-6F9698C6D8B4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9DDCB327-0D20-460F-A7F8-DE038163CD63} = {9DDCB327-0D20-460F-A7F8-DE038163CD63}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolualib", "..\tolualib\tolualib.vcproj", "{9DDCB327-0D20-460F-A7F8-DE038163CD63}"
 EndProject
@@ -20,8 +23,8 @@ Global
 		{71891C1A-E328-4258-AC3F-6F9698C6D8B4}.Release|Win32.Build.0 = withLua51_Release|Win32
 		{71891C1A-E328-4258-AC3F-6F9698C6D8B4}.withLua50_Debug|Win32.ActiveCfg = withLua51_Release|Win32
 		{71891C1A-E328-4258-AC3F-6F9698C6D8B4}.withLua50_Debug|Win32.Build.0 = withLua51_Release|Win32
-		{71891C1A-E328-4258-AC3F-6F9698C6D8B4}.withLua50_Release|Win32.ActiveCfg = withLua50_Release|Win32
-		{71891C1A-E328-4258-AC3F-6F9698C6D8B4}.withLua50_Release|Win32.Build.0 = withLua50_Release|Win32
+		{71891C1A-E328-4258-AC3F-6F9698C6D8B4}.withLua50_Release|Win32.ActiveCfg = withLua51_Release|Win32
+		{71891C1A-E328-4258-AC3F-6F9698C6D8B4}.withLua50_Release|Win32.Build.0 = withLua51_Release|Win32
 		{71891C1A-E328-4258-AC3F-6F9698C6D8B4}.withLua51_Debug|Win32.ActiveCfg = withLua51_Debug|Win32
 		{71891C1A-E328-4258-AC3F-6F9698C6D8B4}.withLua51_Debug|Win32.Build.0 = withLua51_Debug|Win32
 		{71891C1A-E328-4258-AC3F-6F9698C6D8B4}.withLua51_Release|Win32.ActiveCfg = withLua51_Release|Win32
diff --git a/tolua++-1.0.93/win32/vc7/toluapp.vcproj b/tolua++-1.0.93/win32/vc7/toluapp.vcproj
index 59916924d..c2540a2bf 100644
--- a/tolua++-1.0.93/win32/vc7/toluapp.vcproj
+++ b/tolua++-1.0.93/win32/vc7/toluapp.vcproj
@@ -15,164 +15,6 @@
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="withLua50_Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua50.lib"
-				OutputFile="..\..\bin\tolua++_d.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/tolua++.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="withLua50_Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;..\..\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="lua50.lib"
-				OutputFile="..\..\bin\tolua++.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="withLua51_Debug|Win32"
 			OutputDirectory="$(ConfigurationName)"
@@ -199,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../../lua-5.1.4/src&quot;;../../include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -220,7 +62,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Lua5.1.lib"
 				OutputFile="..\..\bin\tolua++_d.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -278,7 +119,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\include;&quot;C:\Program Files (x86)\Lua\5.1\include&quot;"
+				AdditionalIncludeDirectories="&quot;../../../lua-5.1.4/src&quot;;../../include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -297,7 +138,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua5.1.lib"
 				OutputFile="..\..\bin\tolua++.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\lib;&quot;C:\Program Files (x86)\Lua\5.1\lib&quot;"
@@ -336,7 +176,7 @@
 	</References>
 	<Files>
 		<Filter
-			Name="ソース ファイル"
+			Name="source files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
@@ -372,18 +212,226 @@
 				RelativePath="..\..\src\bin\toluabind.c"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="ヘッダー ファイル"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="リソース ファイル"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
+			<Filter
+				Name="Lua"
+				>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lapi.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lapi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lauxlib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lauxlib.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lbaselib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lcode.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lcode.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ldblib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ldebug.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ldebug.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ldo.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ldo.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ldump.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lfunc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lfunc.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lgc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lgc.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\linit.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\liolib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\llex.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\llex.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\llimits.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lmathlib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lmem.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lmem.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\loadlib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lobject.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lobject.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lopcodes.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lopcodes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\loslib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lparser.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lparser.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lstate.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lstate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lstring.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lstring.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lstrlib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ltable.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ltable.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ltablib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ltm.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\ltm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\luac.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\luaconf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lualib.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lundump.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lundump.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lvm.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lvm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lzio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\lzio.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\Makefile"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\lua-5.1.4\src\print.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
-- 
cgit v1.2.3