Fixing and updates for MSVC

3 files changed, 214 insertions, 9 deletions

diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
index d1b056a..aae7e9c 100644
--- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj
+++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

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

-				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL;NO_HFILE"

+				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL;NO_HFILE;READLINE_STATIC;READLINE_LIBRARY"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="5"

@@ -32,7 +32,8 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/Baltisot - generic.lib"/>

+				OutputFile="$(OutDir)/Baltisot - generic.lib"

+				IgnoreAllDefaultLibraries="FALSE"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -58,7 +59,7 @@
 				InlineFunctionExpansion="1"

 				OmitFramePointers="TRUE"

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

-				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL"

+				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL;NO_HFILE;READLINE_STATIC;READLINE_LIBRARY"

 				StringPooling="TRUE"

 				RuntimeLibrary="4"

 				EnableFunctionLevelLinking="TRUE"

@@ -70,7 +71,8 @@
 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/Baltisot - generic.lib"/>

+				OutputFile="$(OutDir)/Baltisot - generic.lib"

+				IgnoreAllDefaultLibraries="FALSE"/>

 			<Tool

 				Name="VCMIDLTool"/>

 			<Tool

@@ -483,6 +485,199 @@
 				</File>

 			</Filter>

 		</Filter>

+		<Filter

+			Name="Readline (external)"

+			Filter="">

+			<File

+				RelativePath="..\readline\ansi_stdlib.h">

+			</File>

+			<File

+				RelativePath="..\readline\bind.c">

+			</File>

+			<File

+				RelativePath="..\readline\callback.c">

+			</File>

+			<File

+				RelativePath="..\readline\chardefs.h">

+			</File>

+			<File

+				RelativePath="..\readline\compat.c">

+			</File>

+			<File

+				RelativePath="..\readline\complete.c">

+			</File>

+			<File

+				RelativePath="..\readline\config.h">

+			</File>

+			<File

+				RelativePath="..\readline\dirent.c">

+			</File>

+			<File

+				RelativePath="..\readline\dirent.h">

+			</File>

+			<File

+				RelativePath="..\readline\display.c">

+			</File>

+			<File

+				RelativePath="..\readline\emacs_keymap.c">

+			</File>

+			<File

+				RelativePath="..\readline\funmap.c">

+			</File>

+			<File

+				RelativePath="..\readline\histexpand.c">

+			</File>

+			<File

+				RelativePath="..\readline\histfile.c">

+			</File>

+			<File

+				RelativePath="..\readline\histlib.h">

+			</File>

+			<File

+				RelativePath="..\readline\history.c">

+			</File>

+			<File

+				RelativePath="..\readline\history.h">

+			</File>

+			<File

+				RelativePath="..\readline\histsearch.c">

+			</File>

+			<File

+				RelativePath="..\readline\input.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						ObjectFile="$(IntDir)/$(InputName)1.obj"/>

+				</FileConfiguration>

+			</File>

+			<File

+				RelativePath="..\readline\isearch.c">

+			</File>

+			<File

+				RelativePath="..\readline\keymaps.c">

+			</File>

+			<File

+				RelativePath="..\readline\keymaps.h">

+			</File>

+			<File

+				RelativePath="..\readline\kill.c">

+			</File>

+			<File

+				RelativePath="..\readline\macro.c">

+			</File>

+			<File

+				RelativePath="..\readline\mbutil.c">

+			</File>

+			<File

+				RelativePath="..\readline\misc.c">

+			</File>

+			<File

+				RelativePath="..\readline\nls.c">

+			</File>

+			<File

+				RelativePath="..\readline\parens.c">

+			</File>

+			<File

+				RelativePath="..\readline\posixdir.h">

+			</File>

+			<File

+				RelativePath="..\readline\posixjmp.h">

+			</File>

+			<File

+				RelativePath="..\readline\posixstat.h">

+			</File>

+			<File

+				RelativePath="..\readline\readline.c">

+			</File>

+			<File

+				RelativePath="..\readline\readline.h">

+			</File>

+			<File

+				RelativePath="..\readline\rlconf.h">

+			</File>

+			<File

+				RelativePath="..\readline\rldefs.h">

+			</File>

+			<File

+				RelativePath="..\readline\rldynlink.h">

+			</File>

+			<File

+				RelativePath="..\readline\rlmbutil.h">

+			</File>

+			<File

+				RelativePath="..\readline\rlprivate.h">

+			</File>

+			<File

+				RelativePath="..\readline\rlshell.h">

+			</File>

+			<File

+				RelativePath="..\readline\rlstdc.h">

+			</File>

+			<File

+				RelativePath="..\readline\rltty.c">

+			</File>

+			<File

+				RelativePath="..\readline\rltty.h">

+			</File>

+			<File

+				RelativePath="..\readline\rltypedefs.h">

+			</File>

+			<File

+				RelativePath="..\readline\rlwinsize.h">

+			</File>

+			<File

+				RelativePath="..\readline\savestring.c">

+			</File>

+			<File

+				RelativePath="..\readline\search.c">

+			</File>

+			<File

+				RelativePath="..\readline\shell.c">

+			</File>

+			<File

+				RelativePath="..\readline\signals.c">

+			</File>

+			<File

+				RelativePath="..\readline\tcap.h">

+			</File>

+			<File

+				RelativePath="..\readline\terminal.c">

+			</File>

+			<File

+				RelativePath="..\readline\text.c">

+			</File>

+			<File

+				RelativePath="..\readline\tilde.c">

+			</File>

+			<File

+				RelativePath="..\readline\tilde.h">

+			</File>

+			<File

+				RelativePath="..\readline\undo.c">

+			</File>

+			<File

+				RelativePath="..\readline\util.c">

+			</File>

+			<File

+				RelativePath="..\readline\vi_keymap.c">

+			</File>

+			<File

+				RelativePath="..\readline\vi_mode.c">

+			</File>

+			<File

+				RelativePath="..\readline\xmalloc.c">

+			</File>

+			<File

+				RelativePath="..\readline\xmalloc.h">

+			</File>

+		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
index 17f8712..b3e4296 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\lib\lua\includes;..\..\generic\lib\lua\include;..\..\generic\include;..\..\includes;..\..\..\zlib"

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

 				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

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

 				InlineFunctionExpansion="1"

 				OmitFramePointers="TRUE"

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

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

 				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL"

 				StringPooling="TRUE"

 				RuntimeLibrary="4"

@@ -137,6 +137,16 @@
 			</File>

 		</Filter>

 		<Filter

+			Name="Misc classes"

+			Filter="">

+			<File

+				RelativePath="..\..\lib\luapsx.cpp">

+			</File>

+			<File

+				RelativePath="..\..\includes\luapsx.h">

+			</File>

+		</Filter>

+		<Filter

 			Name="psxdev.de code"

 			Filter="">

 			<File

diff --git a/MSVC/Tools/master.mak b/MSVC/Tools/master.mak
index 511c6c4..583f1eb 100644
--- a/MSVC/Tools/master.mak
+++ b/MSVC/Tools/master.mak
@@ -48,9 +48,9 @@ _XSD=xsd.exe
 
 #define our basic link line for managed code
 !IFDEF DEBUG
-_LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /MACHINE:I386 /NODEFAULTLIB:LIBC
+_LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /MACHINE:I386 /NODEFAULTLIB:LIBC /DEFAULTLIB:AdvAPI32
 !ELSE
-_LINK=link.exe /INCREMENTAL /NOLOGO /MACHINE:I386 /NODEFAULTLIB:LIBCD
+_LINK=link.exe /INCREMENTAL /NOLOGO /MACHINE:I386 /NODEFAULTLIB:LIBCD /DEFAULTLIB:AdvAPI32
 !ENDIF
 
 #this is used for compiling C# samples
@@ -75,7 +75,7 @@ _CLEANFILES=*.obj *.tlb *.reg
 !ENDIF
 
 #set some command C++ flags
-_CFLAGS=$(_CCFLAGS) /c /EHsc /D "_WINDOWS" /D "ZLIB_DLL"
+_CFLAGS=$(_CCFLAGS) /c /EHsc /D "_WINDOWS" /D "ZLIB_DLL" /D "READLINE_STATIC"
 
 #set debug as the default for c++
 !IFDEF DEBUG