summaryrefslogtreecommitdiff
path: root/MSVC
diff options
context:
space:
mode:
Diffstat (limited to 'MSVC')
-rw-r--r--MSVC/Baltisot - generic/Baltisot - generic.vcproj574
-rw-r--r--MSVC/CD-Tool/CD-Tool.vcproj33
-rw-r--r--MSVC/Dalos/Dalos.vcproj64
-rw-r--r--MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj364
-rw-r--r--MSVC/PSX-Bundle.sln95
-rw-r--r--MSVC/PSX-Bundle.vcproj304
-rw-r--r--MSVC/mogltk/mogltk.vcproj269
7 files changed, 816 insertions, 887 deletions
diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
index 8ef7c15..dfaa172 100644
--- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj
+++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj
@@ -3,7 +3,8 @@
ProjectType="Visual C++"
Version="8,00"
Name="Baltisot - generic"
- ProjectGUID="{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}"
+ ProjectGUID="{BEAF9E07-6592-49AC-9DA5-0B47FAB88C96}"
+ RootNamespace="Baltisotgeneric"
Keyword="Win32Proj"
>
<Platforms>
@@ -16,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"
@@ -38,15 +39,16 @@
/>
<Tool
Name="VCCLCompilerTool"
+ UseUnicodeResponseFiles="true"
Optimization="0"
- AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\dirent;..\regex"
- PreprocessorDefinitions="_WINDOWS;READLINE_STATIC;READLINE_LIBRARY;STDC_HEADERS;STDC"
- MinimalRebuild="TRUE"
+ AdditionalIncludeDirectories="&quot;C:\sources\PSX-Bundle\MSVC\dirent&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\lua\include&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\lua\includes&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\zlib\include&quot;;&quot;C:\sources\PSX-Bundle\generic\include&quot;;&quot;C:\sources\PSX-Bundle\MSVC\regex&quot;"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;READLINE_STATIC;READLINE_LIBRARY;STD_HEADERS;STDC;$(NOINHERIT)"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -60,8 +62,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/Baltisot - generic.lib"
- IgnoreAllDefaultLibraries="FALSE"
/>
<Tool
Name="VCALinkTool"
@@ -73,7 +73,7 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
@@ -81,10 +81,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,17 +104,12 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- OmitFramePointers="TRUE"
- AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\includes;..\..\generic\lib\lua\include;..\dirent;..\regex"
- PreprocessorDefinitions="_WINDOWS;READLINE_STATIC;READLINE_LIBRARY;STDC_HEADERS;STDC"
- StringPooling="TRUE"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ AdditionalIncludeDirectories="&quot;C:\sources\PSX-Bundle\MSVC\dirent&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\lua\include&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\lua\includes&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\zlib\include&quot;;&quot;C:\sources\PSX-Bundle\generic\include&quot;;&quot;C:\sources\PSX-Bundle\MSVC\regex&quot;"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;READLINE_STATIC;READLINE_LIBRARY;STD_HEADERS;STDC;$(NOINHERIT)"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -127,8 +123,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/Baltisot - generic.lib"
- IgnoreAllDefaultLibraries="FALSE"
/>
<Tool
Name="VCALinkTool"
@@ -140,7 +134,7 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
@@ -171,74 +165,6 @@
</File>
</Filter>
<Filter
- Name="String class"
- >
- <File
- RelativePath="..\..\generic\include\BString.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\checkargs.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\datecalc.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\String.cc"
- >
- </File>
- </Filter>
- <Filter
- Name="Handle class"
- >
- <File
- RelativePath="..\..\generic\lib\Handle.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\Handle.h"
- >
- </File>
- <Filter
- Name="Input class"
- >
- <File
- RelativePath="..\..\generic\lib\Input.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\Input.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Output class"
- >
- <File
- RelativePath="..\..\generic\lib\Output.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\Output.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Buffer class"
- >
- <File
- RelativePath="..\..\generic\lib\Buffer.cc"
- >
- </File>
- <File
- RelativePath="..\..\generic\include\Buffer.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
Name="BLua class"
>
<File
@@ -250,26 +176,26 @@
>
</File>
<Filter
- Name="LuaHandle"
+ Name="LuaConfigFile"
>
<File
- RelativePath="..\..\generic\lib\LuaHandle.cc"
+ RelativePath="..\..\generic\lib\LuaConfigFile.cc"
>
</File>
<File
- RelativePath="..\..\generic\include\LuaHandle.h"
+ RelativePath="..\..\generic\include\LuaConfigFile.h"
>
</File>
</Filter>
<Filter
- Name="LuaConfigFile"
+ Name="LuaHandle"
>
<File
- RelativePath="..\..\generic\lib\LuaConfigFile.cc"
+ RelativePath="..\..\generic\lib\LuaHandle.cc"
>
</File>
<File
- RelativePath="..\..\generic\include\LuaConfigFile.h"
+ RelativePath="..\..\generic\include\LuaHandle.h"
>
</File>
</Filter>
@@ -287,46 +213,30 @@
</Filter>
</Filter>
<Filter
- Name="Main class"
+ Name="ConfigFile class"
>
<File
- RelativePath="..\..\generic\lib\Main.cc"
+ RelativePath="..\..\generic\lib\ConfigFile.cc"
>
</File>
<File
- RelativePath="..\..\generic\include\Main.h"
+ RelativePath="..\..\generic\include\ConfigFile.h"
>
</File>
</Filter>
<Filter
- Name="Regex class"
+ Name="Dirent (external)"
>
<File
- RelativePath="..\..\generic\include\BRegex.h"
+ RelativePath="..\dirent\_mingw.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\Regex.cc"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="ConfigFile class"
- >
- <File
- RelativePath="..\..\generic\lib\ConfigFile.cc"
+ RelativePath="..\dirent\dirent.c"
>
</File>
<File
- RelativePath="..\..\generic\include\ConfigFile.h"
+ RelativePath="..\dirent\dirent.h"
>
</File>
</Filter>
@@ -359,48 +269,68 @@
</File>
</Filter>
<Filter
- Name="Regex (external)"
+ Name="GetOpt (external)"
>
<File
- RelativePath="..\regex\msvc-regex.c"
+ RelativePath="..\getopt\getopt.c"
>
</File>
<File
- RelativePath="..\regex\regex.h"
+ RelativePath="..\getopt\getopt.h"
+ >
+ </File>
+ <File
+ RelativePath="..\getopt\getopt1.c"
>
</File>
</Filter>
<Filter
- Name="Dirent (external)"
+ Name="Handle class"
>
<File
- RelativePath="..\dirent\_mingw.h"
+ RelativePath="..\..\generic\lib\Handle.cc"
>
</File>
<File
- RelativePath="..\dirent\dirent.c"
+ RelativePath="..\..\generic\include\Handle.h"
>
- <FileConfiguration
- Name="Debug|Win32"
+ </File>
+ <Filter
+ Name="Buffer class"
+ >
+ <File
+ RelativePath="..\..\generic\lib\Buffer.cc"
>
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
+ </File>
+ <File
+ RelativePath="..\..\generic\include\Buffer.h"
>
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\dirent\dirent.h"
+ </File>
+ </Filter>
+ <Filter
+ Name="Input class"
>
- </File>
+ <File
+ RelativePath="..\..\generic\lib\Input.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\include\Input.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Output class"
+ >
+ <File
+ RelativePath="..\..\generic\lib\Output.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\include\Output.h"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="Lua (external)"
@@ -410,86 +340,82 @@
>
</File>
<Filter
- Name="LuaSrc"
+ Name="LuaHeaders"
>
<File
- RelativePath="..\..\generic\lib\lua\src\lapi.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\lua\src\lcode.c"
+ RelativePath="..\..\generic\lib\lua\includes\lapi.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\ldebug.c"
+ RelativePath="..\..\generic\lib\lua\includes\lcode.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\ldo.c"
+ RelativePath="..\..\generic\lib\lua\includes\ldebug.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\ldump.c"
+ RelativePath="..\..\generic\lib\lua\includes\ldo.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lfunc.c"
+ RelativePath="..\..\generic\lib\lua\includes\lfunc.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lgc.c"
+ RelativePath="..\..\generic\lib\lua\includes\lgc.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\llex.c"
+ RelativePath="..\..\generic\lib\lua\includes\llex.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lmem.c"
+ RelativePath="..\..\generic\lib\lua\includes\llimits.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lobject.c"
+ RelativePath="..\..\generic\lib\lua\includes\lmem.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lopcodes.c"
+ RelativePath="..\..\generic\lib\lua\includes\lobject.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lparser.c"
+ RelativePath="..\..\generic\lib\lua\includes\lopcodes.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lstate.c"
+ RelativePath="..\..\generic\lib\lua\includes\lparser.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lstring.c"
+ RelativePath="..\..\generic\lib\lua\includes\lstate.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\ltable.c"
+ RelativePath="..\..\generic\lib\lua\includes\lstring.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\ltests.c"
+ RelativePath="..\..\generic\lib\lua\includes\ltable.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\ltm.c"
+ RelativePath="..\..\generic\lib\lua\includes\ltm.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lundump.c"
+ RelativePath="..\..\generic\lib\lua\includes\lundump.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lvm.c"
+ RelativePath="..\..\generic\lib\lua\includes\lvm.h"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\src\lzio.c"
+ RelativePath="..\..\generic\lib\lua\includes\lzio.h"
>
</File>
</Filter>
@@ -550,199 +476,103 @@
</File>
</Filter>
<Filter
- Name="LuaHeaders"
+ Name="LuaSrc"
>
<File
- RelativePath="..\..\generic\lib\lua\includes\lapi.h"
+ RelativePath="..\..\generic\lib\lua\src\lapi.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lcode.h"
+ RelativePath="..\..\generic\lib\lua\src\lcode.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\ldebug.h"
+ RelativePath="..\..\generic\lib\lua\src\ldebug.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\ldo.h"
+ RelativePath="..\..\generic\lib\lua\src\ldo.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lfunc.h"
+ RelativePath="..\..\generic\lib\lua\src\ldump.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lgc.h"
+ RelativePath="..\..\generic\lib\lua\src\lfunc.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\llex.h"
+ RelativePath="..\..\generic\lib\lua\src\lgc.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\llimits.h"
+ RelativePath="..\..\generic\lib\lua\src\llex.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lmem.h"
+ RelativePath="..\..\generic\lib\lua\src\lmem.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lobject.h"
+ RelativePath="..\..\generic\lib\lua\src\lobject.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lopcodes.h"
+ RelativePath="..\..\generic\lib\lua\src\lopcodes.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lparser.h"
+ RelativePath="..\..\generic\lib\lua\src\lparser.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lstate.h"
+ RelativePath="..\..\generic\lib\lua\src\lstate.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lstring.h"
+ RelativePath="..\..\generic\lib\lua\src\lstring.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\ltable.h"
+ RelativePath="..\..\generic\lib\lua\src\ltable.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\ltm.h"
+ RelativePath="..\..\generic\lib\lua\src\ltests.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lundump.h"
+ RelativePath="..\..\generic\lib\lua\src\ltm.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lvm.h"
+ RelativePath="..\..\generic\lib\lua\src\lundump.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\lua\includes\lzio.h"
+ RelativePath="..\..\generic\lib\lua\src\lvm.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\lua\src\lzio.c"
>
</File>
</Filter>
</Filter>
<Filter
- Name="GetOpt (external)"
+ Name="Main class"
>
<File
- RelativePath="..\getopt\getopt.c"
- >
- </File>
- <File
- RelativePath="..\getopt\getopt.h"
+ RelativePath="..\..\generic\lib\Main.cc"
>
</File>
<File
- RelativePath="..\getopt\getopt1.c"
+ RelativePath="..\..\generic\include\Main.h"
>
</File>
</Filter>
<Filter
- Name="Zlib (external)"
- >
- <Filter
- Name="Src"
- >
- <File
- RelativePath="..\..\generic\lib\zlib\src\adler32.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\compress.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\crc32.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\deflate.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\gzio.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\inffast.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\inflate.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\inftrees.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\trees.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\uncompr.c"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\src\zutil.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Includes"
- >
- <File
- RelativePath="..\..\generic\lib\zlib\include\crc32.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\deflate.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\inffast.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\inffixed.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\inflate.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\inftrees.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\trees.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\zconf.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\zlib.h"
- >
- </File>
- <File
- RelativePath="..\..\generic\lib\zlib\include\zutil.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
Name="Readline (external)"
>
<File
@@ -776,6 +606,24 @@
<File
RelativePath="..\readline\dirent.c"
>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\readline\dirent.h"
@@ -786,6 +634,10 @@
>
</File>
<File
+ RelativePath="..\readline\emacs_keymap.c"
+ >
+ </File>
+ <File
RelativePath="..\readline\funmap.c"
>
</File>
@@ -821,7 +673,8 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
@@ -829,7 +682,8 @@
>
<Tool
Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
@@ -995,33 +849,145 @@
</File>
</Filter>
<Filter
- Name="HashTables"
+ Name="Regex (external)"
+ >
+ <File
+ RelativePath="..\regex\msvc-regex.c"
+ >
+ </File>
+ <File
+ RelativePath="..\regex\regex.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Regex class"
>
<File
- RelativePath="..\..\generic\lib\hashtab.c"
+ RelativePath="..\..\generic\include\BRegex.h"
>
</File>
<File
- RelativePath="..\..\generic\include\hashtab.h"
+ RelativePath="..\..\generic\lib\Regex.cc"
>
</File>
+ </Filter>
+ <Filter
+ Name="String class"
+ >
<File
- RelativePath="..\..\generic\lib\lookupa.c"
+ RelativePath="..\..\generic\include\BString.h"
>
</File>
<File
- RelativePath="..\..\generic\include\lookupa.h"
+ RelativePath="..\..\generic\lib\checkargs.c"
>
</File>
<File
- RelativePath="..\..\generic\lib\recycle.c"
+ RelativePath="..\..\generic\lib\datecalc.c"
>
</File>
<File
- RelativePath="..\..\generic\include\recycle.h"
+ RelativePath="..\..\generic\lib\String.cc"
>
</File>
</Filter>
+ <Filter
+ Name="Zlib (external)"
+ >
+ <Filter
+ Name="Includes"
+ >
+ <File
+ RelativePath="..\..\generic\lib\zlib\include\crc32.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\include\deflate.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\include\inffast.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\include\inffixed.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\include\inflate.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\include\inftrees.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\include\trees.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\include\zconf.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\include\zlib.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\include\zutil.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Src"
+ >
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\adler32.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\compress.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\crc32.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\deflate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\gzio.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\inffast.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\inflate.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\inftrees.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\trees.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\uncompr.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\generic\lib\zlib\src\zutil.c"
+ >
+ </File>
+ </Filter>
+ </Filter>
</Files>
<Globals>
</Globals>
diff --git a/MSVC/CD-Tool/CD-Tool.vcproj b/MSVC/CD-Tool/CD-Tool.vcproj
index 746136f..c73d2cf 100644
--- a/MSVC/CD-Tool/CD-Tool.vcproj
+++ b/MSVC/CD-Tool/CD-Tool.vcproj
@@ -3,8 +3,8 @@
ProjectType="Visual C++"
Version="8,00"
Name="CD-Tool"
- ProjectGUID="{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}"
- RootNamespace="CD-Tool"
+ ProjectGUID="{937F3AE7-03E9-4EF5-8B59-CAB1DD6C5C58}"
+ RootNamespace="CDTool"
Keyword="Win32Proj"
>
<Platforms>
@@ -17,10 +17,10 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -40,11 +40,11 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\getopt;..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\include;..\..\includes;..\..\psxdev;..\;..\regex"
+ AdditionalIncludeDirectories="&quot;C:\sources\PSX-Bundle\MSVC\getopt&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\MSVC\regex&quot;;&quot;C:\sources\PSX-Bundle\includes&quot;;&quot;C:\sources\PSX-Bundle\psxdev&quot;;&quot;C:\sources\PSX-Bundle\MSVC&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
@@ -61,13 +61,9 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="$(OutDir)/CD-Tool.exe"
LinkIncremental="2"
- AdditionalLibraryDirectories="../../../SDL/lib"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/CD-Tool.pdb"
SubSystem="1"
- StackReserveSize="0"
TargetMachine="1"
/>
<Tool
@@ -97,10 +93,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="2"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -119,9 +116,9 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\getopt;..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\include;..\..\includes;..\..\psxdev;..\;..\regex"
+ AdditionalIncludeDirectories="&quot;C:\sources\PSX-Bundle\MSVC\getopt&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\MSVC\regex&quot;;&quot;C:\sources\PSX-Bundle\includes&quot;;&quot;C:\sources\PSX-Bundle\psxdev&quot;;&quot;C:\sources\PSX-Bundle\MSVC&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
@@ -138,13 +135,9 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="$(OutDir)/CD-Tool.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="../../../SDL/lib"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/CD-Tool.pdb"
SubSystem="1"
- StackReserveSize="0"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
diff --git a/MSVC/Dalos/Dalos.vcproj b/MSVC/Dalos/Dalos.vcproj
index 6665125..b4d3a33 100644
--- a/MSVC/Dalos/Dalos.vcproj
+++ b/MSVC/Dalos/Dalos.vcproj
@@ -3,8 +3,8 @@
ProjectType="Visual C++"
Version="8,00"
Name="Dalos"
- ProjectGUID="{22F8F8CD-B256-446D-9B42-09CE83F74885}"
- RootNamespace="Dal"
+ ProjectGUID="{CDCBA663-BC45-4C3B-87EC-3F684CFF25A8}"
+ RootNamespace="Dalos"
Keyword="Win32Proj"
>
<Platforms>
@@ -17,10 +17,10 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -40,12 +40,11 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\include;..\..\mogltk\include;..\..\..\SDL\include;..\..\MSVC;..\..\;..\..\includes;..\..\psxdev;..\..\Dalos;..\regex"
+ AdditionalIncludeDirectories="C:\sources\SDL\include;&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\MSVC&quot;;&quot;C:\sources\PSX-Bundle\MSVC\regex&quot;;&quot;C:\sources\PSX-Bundle\mogltk\include&quot;;&quot;C:\sources\PSX-Bundle\Dalos&quot;;&quot;C:\sources\PSX-Bundle\includes&quot;;&quot;C:\sources\PSX-Bundle\psxdev&quot;;C:\sources\libusb\include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;READLINE_LIBRARY;READLINE_STATIC"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
@@ -62,12 +61,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDLmain.lib SDL.lib opengl32.lib glu32.lib &quot;..\PSX-Bundle - library\Debug\PSX-Bundle - library.lib&quot; &quot;..\Baltisot - generic\Debug\Baltisot - generic.lib&quot;"
- OutputFile="$(OutDir)/Dalos.exe"
+ AdditionalDependencies="SDLmain.lib SDL.lib opengl32.lib glu32.lib libusb.lib"
LinkIncremental="2"
- AdditionalLibraryDirectories="../../../SDL/lib"
+ AdditionalLibraryDirectories="C:\sources\SDL\lib;C:\sources\libusb\lib\msvc"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/Dalos.pdb"
SubSystem="1"
TargetMachine="1"
/>
@@ -98,10 +95,11 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="2"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -120,11 +118,9 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories="..\..\generic\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\include;..\..\mogltk\include;..\..\..\SDL\include;..\..\MSVC;..\..\;..\..\includes;..\..\psxdev;..\..\Dalos;..\regex"
+ AdditionalIncludeDirectories="C:\sources\SDL\include;&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\MSVC&quot;;&quot;C:\sources\PSX-Bundle\MSVC\regex&quot;;&quot;C:\sources\PSX-Bundle\mogltk\include&quot;;&quot;C:\sources\PSX-Bundle\Dalos&quot;;&quot;C:\sources\PSX-Bundle\includes&quot;;&quot;C:\sources\PSX-Bundle\psxdev&quot;;C:\sources\libusb\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;READLINE_LIBRARY;READLINE_STATIC"
RuntimeLibrary="2"
- BufferSecurityCheck="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
@@ -141,12 +137,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDLmain.lib SDL.lib opengl32.lib glu32.lib &quot;..\PSX-Bundle - library\Release\PSX-Bundle - library.lib&quot; &quot;..\Baltisot - generic\Release\Baltisot - generic.lib&quot;"
- OutputFile="$(OutDir)/Dalos.exe"
+ AdditionalDependencies="SDLmain.lib SDL.lib opengl32.lib glu32.lib libusb.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories="../"
+ AdditionalLibraryDirectories="C:\sources\SDL\lib;C:\sources\libusb\lib\msvc"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/Dalos.pdb"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
@@ -190,10 +184,22 @@
>
</File>
<File
+ RelativePath="..\..\Dalos\control_request.h"
+ >
+ </File>
+ <File
RelativePath="..\..\Dalos\Dalos.cc"
>
</File>
<File
+ RelativePath="..\..\Dalos\evenements.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\Dalos\evenements.h"
+ >
+ </File>
+ <File
RelativePath="..\..\Dalos\Hexview.cc"
>
</File>
@@ -201,6 +207,22 @@
RelativePath="..\..\Dalos\Hexview.h"
>
</File>
+ <File
+ RelativePath="..\..\Dalos\icons.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\Dalos\icons.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\Dalos\vtplayer-ctrl.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\Dalos\vtplayer-ctrl.h"
+ >
+ </File>
</Files>
<Globals>
</Globals>
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>
diff --git a/MSVC/PSX-Bundle.sln b/MSVC/PSX-Bundle.sln
index 5d0a90d..c59fb5a 100644
--- a/MSVC/PSX-Bundle.sln
+++ b/MSVC/PSX-Bundle.sln
@@ -1,45 +1,30 @@
+
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tools", "Tools\Tools.vcproj", "{6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}"
- ProjectSection(ProjectDependencies) = postProject
- {0A2CD193-F270-4F2B-943C-F8BDF792D25C} = {0A2CD193-F270-4F2B-943C-F8BDF792D25C}
- {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mogltk", "mogltk\mogltk.vcproj", "{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}"
- ProjectSection(ProjectDependencies) = postProject
- {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dalos", "Dalos\Dalos.vcproj", "{22F8F8CD-B256-446D-9B42-09CE83F74885}"
- ProjectSection(ProjectDependencies) = postProject
- {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483} = {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}
- {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A} = {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Baltisot - generic", "Baltisot - generic\Baltisot - generic.vcproj", "{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Baltisot - generic", "Baltisot - generic\Baltisot - generic.vcproj", "{BEAF9E07-6592-49AC-9DA5-0B47FAB88C96}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PSX-Bundle - library", "PSX-Bundle - library\PSX-Bundle - library.vcproj", "{0A2CD193-F270-4F2B-943C-F8BDF792D25C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PSX-Bundle - library", "PSX-Bundle - library\PSX-Bundle - library.vcproj", "{A7C52E48-947F-4B84-84F8-B2BD1314C9B4}"
ProjectSection(ProjectDependencies) = postProject
- {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}
+ {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96} = {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CD-Tool", "CD-Tool\CD-Tool.vcproj", "{1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mogltk", "mogltk\mogltk.vcproj", "{4C08E5A7-AE14-4454-A64B-8D1A24362B87}"
ProjectSection(ProjectDependencies) = postProject
- {0A2CD193-F270-4F2B-943C-F8BDF792D25C} = {0A2CD193-F270-4F2B-943C-F8BDF792D25C}
- {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}
+ {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96} = {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaPatch", "LuaPatch\LuaPatch.vcproj", "{6BE81B31-B5A4-42B3-AD54-85C0F41AEE09}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CD-Tool", "CD-Tool\CD-Tool.vcproj", "{937F3AE7-03E9-4EF5-8B59-CAB1DD6C5C58}"
ProjectSection(ProjectDependencies) = postProject
- {0A2CD193-F270-4F2B-943C-F8BDF792D25C} = {0A2CD193-F270-4F2B-943C-F8BDF792D25C}
- {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}
+ {A7C52E48-947F-4B84-84F8-B2BD1314C9B4} = {A7C52E48-947F-4B84-84F8-B2BD1314C9B4}
+ {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96} = {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PSx-Patcher", "PSx-Patcher\PSx-Patcher.vcproj", "{E9AA47EC-9370-467F-9B72-F166CB9C431D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dalos", "Dalos\Dalos.vcproj", "{CDCBA663-BC45-4C3B-87EC-3F684CFF25A8}"
ProjectSection(ProjectDependencies) = postProject
- {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}
- {0A2CD193-F270-4F2B-943C-F8BDF792D25C} = {0A2CD193-F270-4F2B-943C-F8BDF792D25C}
+ {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96} = {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96}
+ {A7C52E48-947F-4B84-84F8-B2BD1314C9B4} = {A7C52E48-947F-4B84-84F8-B2BD1314C9B4}
+ {4C08E5A7-AE14-4454-A64B-8D1A24362B87} = {4C08E5A7-AE14-4454-A64B-8D1A24362B87}
+ {937F3AE7-03E9-4EF5-8B59-CAB1DD6C5C58} = {937F3AE7-03E9-4EF5-8B59-CAB1DD6C5C58}
EndProjectSection
EndProject
Global
@@ -48,38 +33,26 @@ Global
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Debug|Win32.ActiveCfg = Debug|Win32
- {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Debug|Win32.Build.0 = Debug|Win32
- {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Release|Win32.ActiveCfg = Release|Win32
- {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Release|Win32.Build.0 = Release|Win32
- {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Debug|Win32.ActiveCfg = Debug|Win32
- {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Debug|Win32.Build.0 = Debug|Win32
- {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Release|Win32.ActiveCfg = Release|Win32
- {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Release|Win32.Build.0 = Release|Win32
- {22F8F8CD-B256-446D-9B42-09CE83F74885}.Debug|Win32.ActiveCfg = Debug|Win32
- {22F8F8CD-B256-446D-9B42-09CE83F74885}.Debug|Win32.Build.0 = Debug|Win32
- {22F8F8CD-B256-446D-9B42-09CE83F74885}.Release|Win32.ActiveCfg = Release|Win32
- {22F8F8CD-B256-446D-9B42-09CE83F74885}.Release|Win32.Build.0 = Release|Win32
- {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Debug|Win32.ActiveCfg = Debug|Win32
- {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Debug|Win32.Build.0 = Debug|Win32
- {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Release|Win32.ActiveCfg = Release|Win32
- {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Release|Win32.Build.0 = Release|Win32
- {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Debug|Win32.ActiveCfg = Debug|Win32
- {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Debug|Win32.Build.0 = Debug|Win32
- {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Release|Win32.ActiveCfg = Release|Win32
- {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Release|Win32.Build.0 = Release|Win32
- {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Debug|Win32.ActiveCfg = Debug|Win32
- {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Debug|Win32.Build.0 = Debug|Win32
- {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Release|Win32.ActiveCfg = Release|Win32
- {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Release|Win32.Build.0 = Release|Win32
- {6BE81B31-B5A4-42B3-AD54-85C0F41AEE09}.Debug|Win32.ActiveCfg = Debug|Win32
- {6BE81B31-B5A4-42B3-AD54-85C0F41AEE09}.Debug|Win32.Build.0 = Debug|Win32
- {6BE81B31-B5A4-42B3-AD54-85C0F41AEE09}.Release|Win32.ActiveCfg = Release|Win32
- {6BE81B31-B5A4-42B3-AD54-85C0F41AEE09}.Release|Win32.Build.0 = Release|Win32
- {E9AA47EC-9370-467F-9B72-F166CB9C431D}.Debug|Win32.ActiveCfg = Debug|Win32
- {E9AA47EC-9370-467F-9B72-F166CB9C431D}.Debug|Win32.Build.0 = Debug|Win32
- {E9AA47EC-9370-467F-9B72-F166CB9C431D}.Release|Win32.ActiveCfg = Release|Win32
- {E9AA47EC-9370-467F-9B72-F166CB9C431D}.Release|Win32.Build.0 = Release|Win32
+ {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96}.Debug|Win32.Build.0 = Debug|Win32
+ {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96}.Release|Win32.ActiveCfg = Release|Win32
+ {BEAF9E07-6592-49AC-9DA5-0B47FAB88C96}.Release|Win32.Build.0 = Release|Win32
+ {A7C52E48-947F-4B84-84F8-B2BD1314C9B4}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A7C52E48-947F-4B84-84F8-B2BD1314C9B4}.Debug|Win32.Build.0 = Debug|Win32
+ {A7C52E48-947F-4B84-84F8-B2BD1314C9B4}.Release|Win32.ActiveCfg = Release|Win32
+ {A7C52E48-947F-4B84-84F8-B2BD1314C9B4}.Release|Win32.Build.0 = Release|Win32
+ {4C08E5A7-AE14-4454-A64B-8D1A24362B87}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4C08E5A7-AE14-4454-A64B-8D1A24362B87}.Debug|Win32.Build.0 = Debug|Win32
+ {4C08E5A7-AE14-4454-A64B-8D1A24362B87}.Release|Win32.ActiveCfg = Release|Win32
+ {4C08E5A7-AE14-4454-A64B-8D1A24362B87}.Release|Win32.Build.0 = Release|Win32
+ {937F3AE7-03E9-4EF5-8B59-CAB1DD6C5C58}.Debug|Win32.ActiveCfg = Debug|Win32
+ {937F3AE7-03E9-4EF5-8B59-CAB1DD6C5C58}.Debug|Win32.Build.0 = Debug|Win32
+ {937F3AE7-03E9-4EF5-8B59-CAB1DD6C5C58}.Release|Win32.ActiveCfg = Release|Win32
+ {937F3AE7-03E9-4EF5-8B59-CAB1DD6C5C58}.Release|Win32.Build.0 = Release|Win32
+ {CDCBA663-BC45-4C3B-87EC-3F684CFF25A8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CDCBA663-BC45-4C3B-87EC-3F684CFF25A8}.Debug|Win32.Build.0 = Debug|Win32
+ {CDCBA663-BC45-4C3B-87EC-3F684CFF25A8}.Release|Win32.ActiveCfg = Release|Win32
+ {CDCBA663-BC45-4C3B-87EC-3F684CFF25A8}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/MSVC/PSX-Bundle.vcproj b/MSVC/PSX-Bundle.vcproj
index 2956ce7..c91bcc9 100644
--- a/MSVC/PSX-Bundle.vcproj
+++ b/MSVC/PSX-Bundle.vcproj
@@ -1,117 +1,187 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.00"
- Name="PSX-Bundle"
- ProjectGUID="{AB3988B9-FC80-448D-B22A-21384E824F16}"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="Debug"
- IntermediateDirectory="Debug"
- ConfigurationType="1"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="5"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/PSX-Bundle.exe"
- LinkIncremental="2"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/PSX-Bundle.pdb"
- SubSystem="2"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="Release"
- IntermediateDirectory="Release"
- ConfigurationType="1"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- OmitFramePointers="TRUE"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- StringPooling="TRUE"
- RuntimeLibrary="4"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/PSX-Bundle.exe"
- LinkIncremental="1"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- </Configuration>
- </Configurations>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc">
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8,00"
+ Name="PSX-Bundle"
+ ProjectGUID="{CF5B352A-6714-41FD-9614-C561A374BF7A}"
+ RootNamespace="PSXBundle"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/MSVC/mogltk/mogltk.vcproj b/MSVC/mogltk/mogltk.vcproj
index c47be28..b422a12 100644
--- a/MSVC/mogltk/mogltk.vcproj
+++ b/MSVC/mogltk/mogltk.vcproj
@@ -3,7 +3,8 @@
ProjectType="Visual C++"
Version="8,00"
Name="mogltk"
- ProjectGUID="{34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}"
+ ProjectGUID="{4C08E5A7-AE14-4454-A64B-8D1A24362B87}"
+ RootNamespace="mogltk"
Keyword="Win32Proj"
>
<Platforms>
@@ -16,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"
@@ -39,14 +40,14 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\mogltk\include;..\..\generic\include;..\..\..\SDL\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\include"
+ AdditionalIncludeDirectories="C:\sources\SDL\include;&quot;C:\sources\PSX-Bundle\mogltk\include&quot;;&quot;C:\sources\PSX-Bundle\generic\include&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\zlib\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- MinimalRebuild="TRUE"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -60,7 +61,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/mogltk.lib"
/>
<Tool
Name="VCALinkTool"
@@ -72,7 +72,7 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
@@ -80,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"
@@ -102,17 +103,12 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- OmitFramePointers="TRUE"
- AdditionalIncludeDirectories="..\..\mogltk\include;..\..\generic\include;..\..\..\SDL\include;..\..\generic\lib\zlib\include;..\..\generic\lib\lua\include"
+ AdditionalIncludeDirectories="C:\sources\SDL\include;&quot;C:\sources\PSX-Bundle\mogltk\include&quot;;&quot;C:\sources\PSX-Bundle\generic\include&quot;;&quot;C:\sources\PSX-Bundle\generic\lib\zlib\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- StringPooling="TRUE"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="TRUE"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -126,7 +122,6 @@
/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/mogltk.lib"
/>
<Tool
Name="VCALinkTool"
@@ -138,7 +133,7 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCAppVerifierTool"
+ Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
@@ -148,142 +143,114 @@
<References>
</References>
<Files>
- <Filter
- Name="base"
+ <File
+ RelativePath="..\..\mogltk\lib\base.cc"
>
- <File
- RelativePath="..\..\mogltk\lib\base.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\base.h"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\lib\glbase.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\glbase.h"
- >
- </File>
- </Filter>
- <Filter
- Name="engine"
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\base.h"
>
- <File
- RelativePath="..\..\mogltk\lib\engine.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\engine.h"
- >
- </File>
- </Filter>
- <Filter
- Name="font"
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\engine.cc"
>
- <File
- RelativePath="..\..\mogltk\lib\font.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\font.h"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\lib\glfont.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\glfont.h"
- >
- </File>
- </Filter>
- <Filter
- Name="mcolor"
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\engine.h"
>
- <File
- RelativePath="..\..\mogltk\lib\mcolor.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\mcolor.h"
- >
- </File>
- </Filter>
- <Filter
- Name="shape"
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\font.cc"
>
- <File
- RelativePath="..\..\mogltk\lib\glshape.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\glshape.h"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\lib\shape.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\shape.h"
- >
- </File>
- </Filter>
- <Filter
- Name="sprite"
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\font.h"
>
- <File
- RelativePath="..\..\mogltk\lib\glsprite.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\glsprite.h"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\lib\sprite.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\sprite.h"
- >
- </File>
- </Filter>
- <Filter
- Name="texture"
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\gettext.h"
>
- <File
- RelativePath="..\..\mogltk\lib\texture.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\texture.h"
- >
- </File>
- </Filter>
- <Filter
- Name="widgets"
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\glbase.cc"
>
- <File
- RelativePath="..\..\mogltk\lib\glwidgets.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\glwidgets.h"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\lib\widgets.cc"
- >
- </File>
- <File
- RelativePath="..\..\mogltk\include\widgets.h"
- >
- </File>
- </Filter>
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\glbase.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\glfont.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\glfont.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\glshape.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\glshape.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\glsprite.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\glsprite.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\glwidgets.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\glwidgets.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\mcolor.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\mcolor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\shape.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\shape.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\sprite.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\sprite.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\texture.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\texture.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\lib\widgets.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\mogltk\include\widgets.h"
+ >
+ </File>
</Files>
<Globals>
</Globals>