Having LUA now in cd-tool! Yay!

2 files changed, 96 insertions, 93 deletions

diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
index 8e56ab9..40d20c2 100644
--- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj
+++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
@@ -213,8 +213,11 @@
 		<Filter

 			Name="Lua (external)"

 			Filter="">

+			<File

+				RelativePath="..\..\generic\lib\lua\src\luacomp.c">

+			</File>

 			<Filter

-				Name="Src"

+				Name="LuaSrc"

 				Filter="">

 				<File

 					RelativePath="..\..\generic\lib\lua\src\lapi.c">

@@ -276,98 +279,9 @@
 				<File

 					RelativePath="..\..\generic\lib\lua\src\lzio.c">

 				</File>

-				<Filter

-					Name="LuaLib"

-					Filter="">

-					<File

-						RelativePath="..\..\generic\lib\lua\src\LuaLib\lauxlib.c">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\src\LuaLib\lbaselib.c">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\src\LuaLib\ldblib.c">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\src\LuaLib\liolib.c">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\src\LuaLib\lmathlib.c">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\src\LuaLib\loadlib.c">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\src\LuaLib\lstrlib.c">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\src\LuaLib\ltablib.c">

-					</File>

-				</Filter>

-				<Filter

-					Name="Headers"

-					Filter="">

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lapi.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lcode.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\ldebug.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\ldo.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lfunc.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lgc.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\llex.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\llimits.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lmem.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lobject.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lopcodes.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lparser.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lstate.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lstring.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\ltable.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\ltm.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lundump.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lvm.h">

-					</File>

-					<File

-						RelativePath="..\..\generic\lib\lua\includes\lzio.h">

-					</File>

-				</Filter>

 			</Filter>

 			<Filter

-				Name="Includes"

+				Name="LuaIncludes"

 				Filter="">

 				<File

 					RelativePath="..\..\generic\lib\lua\include\lauxlib.h">

@@ -379,6 +293,95 @@
 					RelativePath="..\..\generic\lib\lua\include\lualib.h">

 				</File>

 			</Filter>

+			<Filter

+				Name="LuaLib"

+				Filter="">

+				<File

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\lauxlib.c">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\lbaselib.c">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\ldblib.c">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\liolib.c">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\lmathlib.c">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\loadlib.c">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\lstrlib.c">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\src\LuaLib\ltablib.c">

+				</File>

+			</Filter>

+			<Filter

+				Name="LuaHeaders"

+				Filter="">

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lapi.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lcode.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\ldebug.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\ldo.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lfunc.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lgc.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\llex.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\llimits.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lmem.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lobject.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lopcodes.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lparser.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lstate.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lstring.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\ltable.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\ltm.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lundump.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lvm.h">

+				</File>

+				<File

+					RelativePath="..\..\generic\lib\lua\includes\lzio.h">

+				</File>

+			</Filter>

 		</Filter>

 		<Filter

 			Name="GetOpt (external)"

diff --git a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
index 8e23fb4..17f8712 100644
--- a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
+++ b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
@@ -19,7 +19,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\generic\include;..\..\includes;..\..\..\zlib"

+				AdditionalIncludeDirectories="..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\..\generic\include;..\..\includes;..\..\..\zlib"

 				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

@@ -57,7 +57,7 @@
 				Optimization="2"

 				InlineFunctionExpansion="1"

 				OmitFramePointers="TRUE"

-				AdditionalIncludeDirectories="..\..\generic\include;..\..\includes;..\..\..\zlib"

+				AdditionalIncludeDirectories="..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\..\generic\include;..\..\includes;..\..\..\zlib"

 				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL"

 				StringPooling="TRUE"

 				RuntimeLibrary="4"