Updating MSVC direcotory tree with Visual Studio 2005 support.

1 files changed, 151 insertions, 213 deletions

diff --git a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
index a4cf116..3bf1a7f 100644
--- a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
+++ b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj
@@ -3,8 +3,8 @@
 	ProjectType="Visual C++"
 	Version="8,00"
 	Name="PSX-Bundle - library"
-	ProjectGUID="{0A2CD193-F270-4F2B-943C-F8BDF792D25C}"
-	RootNamespace="PSX-Bundle - library"
+	ProjectGUID="{A7C52E48-947F-4B84-84F8-B2BD1314C9B4}"
+	RootNamespace="PSXBundlelibrary"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -17,10 +17,10 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,11 +40,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\..\generic\include;..\..\includes;..\..\generic\lib\zlib\include;..\..\psxdev"
-				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL"
+				AdditionalIncludeDirectories="&quot;C:\sources\PSX-Bundle\includes&quot;;&quot;C:\sources\PSX-Bundle\generic\include&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\zlib\include&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\lua\include&quot;;&quot;C:\sources\PSX-Bundle\psxdev&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;$(NOINHERIT)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -61,7 +61,6 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/PSX-Bundle - library.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -81,10 +80,11 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -103,14 +103,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\..\generic\include;..\..\includes;..\..\generic\lib\zlib\include;..\..\psxdev"
-				PreprocessorDefinitions="_WINDOWS;ZLIB_DLL"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
+				AdditionalIncludeDirectories="&quot;C:\sources\PSX-Bundle\includes&quot;;&quot;C:\sources\PSX-Bundle\generic\include&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\zlib\include&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\lua\include&quot;;&quot;C:\sources\PSX-Bundle\psxdev&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;$(NOINHERIT)"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -127,7 +122,6 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/PSX-Bundle - library.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -149,198 +143,142 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Lzss class"
-			>
-			<File
-				RelativePath="..\..\lib\lzss.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\lzss.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\sliding-window.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\sliding-window.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="CD classes"
-			>
-			<File
-				RelativePath="..\..\lib\cdabstract.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\cdabstract.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\cdreader.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\cdreader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\cdutils.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\cdutils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\crctable.out"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\crctables"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\dvdabstract.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\dvdabstract.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\isobuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\isobuilder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\luacd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\luacd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\yazedc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\yazedc.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Misc classes"
-			>
-			<File
-				RelativePath="..\..\lib\luapsx.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\luapsx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="psxdev.de code"
-			>
-			<File
-				RelativePath="..\..\psxdev\bs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\psxdev\bs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\psxdev\common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\psxdev\idctfst.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\psxdev\jfdctint.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\psxdev\table.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\psxdev\vlc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\psxdev\xadecode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\psxdev\xadecode.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Documentation"
-			>
-			<File
-				RelativePath="..\..\FAQ.txt"
-				>
-			</File>
-			<Filter
-				Name="English"
-				>
-				<File
-					RelativePath="..\..\FAQ-cd.txt"
-					>
-				</File>
-				<File
-					RelativePath="..\..\FAQ-lzss.txt"
-					>
-				</File>
-				<File
-					RelativePath="..\..\FAQ-psx.txt"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="French"
-				>
-				<File
-					RelativePath="..\..\EmuPatch-FAQ.txt"
-					>
-				</File>
-				<File
-					RelativePath="..\..\FAQ-cd-fr.txt"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Binaries classes"
-			>
-			<File
-				RelativePath="..\..\lib\binary-elf.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lib\binary.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\includes\binary.h"
-				>
-			</File>
-		</Filter>
+		<File
+			RelativePath="..\..\lib\binary-elf.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\binary-elf.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\binary.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\binary.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\binwriter-elf.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\binwriter-elf.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\binwriter.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\binwriter.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\psxdev\bs.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\psxdev\bs.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\cd-tool-hc.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\cdabstract.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\cdabstract.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\cdreader.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\cdreader.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\cdutils.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\cdutils.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\psxdev\common.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\dvdabstract.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\dvdabstract.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\psxdev\idctfst.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\isobuilder.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\isobuilder.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\psxdev\jfdctint.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\luacd.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\luacd.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\luapsx.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\luapsx.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\psxdev\table.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\psxdev\vlc.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\psxdev\xadecode.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\psxdev\xadecode.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\lib\yazedc.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\includes\yazedc.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>