From 94d16e0f97c26fe28854505bc94e25b681f32497 Mon Sep 17 00:00:00 2001 From: pixel Date: Tue, 21 Dec 2004 08:30:07 +0000 Subject: Upgrading to MS Visual Studio 2005 --- MSVC/Baltisot - generic/Baltisot - generic.vcproj | 729 ++++++++++++++------- MSVC/CD-Tool/CD-Tool.vcproj | 148 +++-- MSVC/Dalos/Dalos.vcproj | 145 ++-- .../PSX-Bundle - library.vcproj | 231 ++++--- MSVC/PSX-Bundle.sln | 66 +- MSVC/Tools/Tools.vcproj | 171 +++-- MSVC/Tools/master.mak | 4 +- MSVC/mogltk/mogltk.vcproj | 218 +++--- 8 files changed, 1132 insertions(+), 580 deletions(-) diff --git a/MSVC/Baltisot - generic/Baltisot - generic.vcproj b/MSVC/Baltisot - generic/Baltisot - generic.vcproj index fb1ace4..11afd5e 100644 --- a/MSVC/Baltisot - generic/Baltisot - generic.vcproj +++ b/MSVC/Baltisot - generic/Baltisot - generic.vcproj @@ -1,21 +1,41 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + CharacterSet="2" + > + + + + + + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> - - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile="$(OutDir)/Baltisot - generic.lib" + IgnoreAllDefaultLibraries="FALSE" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + + + + + + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> - - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + OutputFile="$(OutDir)/Baltisot - generic.lib" + IgnoreAllDefaultLibraries="FALSE" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> @@ -104,653 +152,838 @@ + > + RelativePath="..\..\generic\lib\Exceptions.cc" + > + RelativePath="..\..\generic\include\Exceptions.h" + > + RelativePath="..\..\generic\lib\generic.cc" + > + RelativePath="..\..\generic\include\generic.h" + > + > + RelativePath="..\..\generic\include\BString.h" + > + RelativePath="..\..\generic\lib\checkargs.c" + > + RelativePath="..\..\generic\lib\datecalc.c" + > + RelativePath="..\..\generic\lib\String.cc" + > + > + RelativePath="..\..\generic\lib\Handle.cc" + > + RelativePath="..\..\generic\include\Handle.h" + > + > + RelativePath="..\..\generic\lib\Input.cc" + > + RelativePath="..\..\generic\include\Input.h" + > + > + RelativePath="..\..\generic\lib\Output.cc" + > + RelativePath="..\..\generic\include\Output.h" + > + > + RelativePath="..\..\generic\lib\Buffer.cc" + > + RelativePath="..\..\generic\include\Buffer.h" + > + > + RelativePath="..\..\generic\lib\BLua.cc" + > + RelativePath="..\..\generic\include\BLua.h" + > + > + RelativePath="..\..\generic\lib\LuaHandle.cc" + > + RelativePath="..\..\generic\include\LuaHandle.h" + > + > + RelativePath="..\..\generic\lib\Main.cc" + > + RelativePath="..\..\generic\include\Main.h" + > + > + RelativePath="..\..\generic\include\BRegex.h" + > + RelativePath="..\..\generic\lib\Regex.cc" + > + Name="Release|Win32" + > + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + > + RelativePath="..\..\generic\lib\ConfigFile.cc" + > + RelativePath="..\..\generic\include\ConfigFile.h" + > + > + RelativePath="..\..\generic\doc\API" + > + RelativePath="..\..\generic\doc\README" + > + RelativePath="..\..\generic\doc\rfc1866.txt" + > + RelativePath="..\..\generic\doc\rfc2616.txt" + > + RelativePath="..\..\generic\doc\rfc2812.txt" + > + RelativePath="..\..\generic\doc\rfc959.txt" + > + > + RelativePath="..\regex\msvc-regex.c" + > + RelativePath="..\regex\regex.h" + > + > + RelativePath="..\dirent\_mingw.h" + > + RelativePath="..\dirent\dirent.c" + > + Name="Debug|Win32" + > + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + Name="Release|Win32" + > + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + RelativePath="..\dirent\dirent.h" + > + > + RelativePath="..\..\generic\lib\lua\src\luacomp.c" + > + > + RelativePath="..\..\generic\lib\lua\src\lapi.c" + > + RelativePath="..\..\generic\lib\lua\src\lcode.c" + > + RelativePath="..\..\generic\lib\lua\src\ldebug.c" + > + RelativePath="..\..\generic\lib\lua\src\ldo.c" + > + RelativePath="..\..\generic\lib\lua\src\ldump.c" + > + RelativePath="..\..\generic\lib\lua\src\lfunc.c" + > + RelativePath="..\..\generic\lib\lua\src\lgc.c" + > + RelativePath="..\..\generic\lib\lua\src\llex.c" + > + RelativePath="..\..\generic\lib\lua\src\lmem.c" + > + RelativePath="..\..\generic\lib\lua\src\lobject.c" + > + RelativePath="..\..\generic\lib\lua\src\lopcodes.c" + > + RelativePath="..\..\generic\lib\lua\src\lparser.c" + > + RelativePath="..\..\generic\lib\lua\src\lstate.c" + > + RelativePath="..\..\generic\lib\lua\src\lstring.c" + > + RelativePath="..\..\generic\lib\lua\src\ltable.c" + > + RelativePath="..\..\generic\lib\lua\src\ltests.c" + > + RelativePath="..\..\generic\lib\lua\src\ltm.c" + > + RelativePath="..\..\generic\lib\lua\src\lundump.c" + > + RelativePath="..\..\generic\lib\lua\src\lvm.c" + > + RelativePath="..\..\generic\lib\lua\src\lzio.c" + > + > + RelativePath="..\..\generic\lib\lua\include\lauxlib.h" + > + RelativePath="..\..\generic\lib\lua\include\lua.h" + > + RelativePath="..\..\generic\lib\lua\include\lualib.h" + > + > + RelativePath="..\..\generic\lib\lua\src\LuaLib\lauxlib.c" + > + RelativePath="..\..\generic\lib\lua\src\LuaLib\lbaselib.c" + > + RelativePath="..\..\generic\lib\lua\src\LuaLib\ldblib.c" + > + RelativePath="..\..\generic\lib\lua\src\LuaLib\ldirlib.c" + > + RelativePath="..\..\generic\lib\lua\src\LuaLib\liolib.c" + > + RelativePath="..\..\generic\lib\lua\src\LuaLib\lmathlib.c" + > + RelativePath="..\..\generic\lib\lua\src\LuaLib\loadlib.c" + > + RelativePath="..\..\generic\lib\lua\src\LuaLib\lstrlib.c" + > + RelativePath="..\..\generic\lib\lua\src\LuaLib\ltablib.c" + > + > + RelativePath="..\..\generic\lib\lua\includes\lapi.h" + > + RelativePath="..\..\generic\lib\lua\includes\lcode.h" + > + RelativePath="..\..\generic\lib\lua\includes\ldebug.h" + > + RelativePath="..\..\generic\lib\lua\includes\ldo.h" + > + RelativePath="..\..\generic\lib\lua\includes\lfunc.h" + > + RelativePath="..\..\generic\lib\lua\includes\lgc.h" + > + RelativePath="..\..\generic\lib\lua\includes\llex.h" + > + RelativePath="..\..\generic\lib\lua\includes\llimits.h" + > + RelativePath="..\..\generic\lib\lua\includes\lmem.h" + > + RelativePath="..\..\generic\lib\lua\includes\lobject.h" + > + RelativePath="..\..\generic\lib\lua\includes\lopcodes.h" + > + RelativePath="..\..\generic\lib\lua\includes\lparser.h" + > + RelativePath="..\..\generic\lib\lua\includes\lstate.h" + > + RelativePath="..\..\generic\lib\lua\includes\lstring.h" + > + RelativePath="..\..\generic\lib\lua\includes\ltable.h" + > + RelativePath="..\..\generic\lib\lua\includes\ltm.h" + > + RelativePath="..\..\generic\lib\lua\includes\lundump.h" + > + RelativePath="..\..\generic\lib\lua\includes\lvm.h" + > + RelativePath="..\..\generic\lib\lua\includes\lzio.h" + > + > + RelativePath="..\getopt\getopt.c" + > + RelativePath="..\getopt\getopt.h" + > + RelativePath="..\getopt\getopt1.c" + > + > + > + RelativePath="..\..\generic\lib\zlib\src\adler32.c" + > + RelativePath="..\..\generic\lib\zlib\src\compress.c" + > + RelativePath="..\..\generic\lib\zlib\src\crc32.c" + > + RelativePath="..\..\generic\lib\zlib\src\deflate.c" + > + RelativePath="..\..\generic\lib\zlib\src\gzio.c" + > + RelativePath="..\..\generic\lib\zlib\src\infblock.c" + > + RelativePath="..\..\generic\lib\zlib\src\infcodes.c" + > + RelativePath="..\..\generic\lib\zlib\src\inffast.c" + > + RelativePath="..\..\generic\lib\zlib\src\inflate.c" + > + RelativePath="..\..\generic\lib\zlib\src\inftrees.c" + > + RelativePath="..\..\generic\lib\zlib\src\infutil.c" + > + RelativePath="..\..\generic\lib\zlib\src\trees.c" + > + RelativePath="..\..\generic\lib\zlib\src\uncompr.c" + > + RelativePath="..\..\generic\lib\zlib\src\zutil.c" + > + > + RelativePath="..\..\generic\lib\zlib\include\deflate.h" + > + RelativePath="..\..\generic\lib\zlib\include\infblock.h" + > + RelativePath="..\..\generic\lib\zlib\include\infcodes.h" + > + RelativePath="..\..\generic\lib\zlib\include\inffast.h" + > + RelativePath="..\..\generic\lib\zlib\include\inffixed.h" + > + RelativePath="..\..\generic\lib\zlib\include\inftrees.h" + > + RelativePath="..\..\generic\lib\zlib\include\infutil.h" + > + RelativePath="..\..\generic\lib\zlib\include\trees.h" + > + RelativePath="..\..\generic\lib\zlib\include\zconf.h" + > + RelativePath="..\..\generic\lib\zlib\include\zlib.h" + > + RelativePath="..\..\generic\lib\zlib\include\zutil.h" + > + > + RelativePath="..\readline\ansi_stdlib.h" + > + RelativePath="..\readline\bind.c" + > + RelativePath="..\readline\callback.c" + > + RelativePath="..\readline\chardefs.h" + > + RelativePath="..\readline\compat.c" + > + RelativePath="..\readline\complete.c" + > + RelativePath="..\readline\config.h" + > + RelativePath="..\readline\dirent.c" + > + RelativePath="..\readline\dirent.h" + > + RelativePath="..\readline\display.c" + > + RelativePath="..\readline\funmap.c" + > + RelativePath="..\readline\histexpand.c" + > + RelativePath="..\readline\histfile.c" + > + RelativePath="..\readline\histlib.h" + > + RelativePath="..\readline\history.c" + > + RelativePath="..\readline\history.h" + > + RelativePath="..\readline\histsearch.c" + > + RelativePath="..\readline\input.c" + > + Name="Debug|Win32" + > + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + Name="Release|Win32" + > + ObjectFile="$(IntDir)/$(InputName)1.obj" + /> + RelativePath="..\readline\isearch.c" + > + RelativePath="..\readline\keymaps.c" + > + RelativePath="..\readline\keymaps.h" + > + RelativePath="..\readline\kill.c" + > + RelativePath="..\readline\macro.c" + > + RelativePath="..\readline\mbutil.c" + > + RelativePath="..\readline\misc.c" + > + RelativePath="..\readline\nls.c" + > + RelativePath="..\readline\parens.c" + > + RelativePath="..\readline\posixdir.h" + > + RelativePath="..\readline\posixjmp.h" + > + RelativePath="..\readline\posixstat.h" + > + RelativePath="..\readline\readline.c" + > + RelativePath="..\readline\readline.h" + > + RelativePath="..\readline\rlconf.h" + > + RelativePath="..\readline\rldefs.h" + > + RelativePath="..\readline\rldynlink.h" + > + RelativePath="..\readline\rlmbutil.h" + > + RelativePath="..\readline\rlprivate.h" + > + RelativePath="..\readline\rlshell.h" + > + RelativePath="..\readline\rlstdc.h" + > + RelativePath="..\readline\rltty.c" + > + RelativePath="..\readline\rltty.h" + > + RelativePath="..\readline\rltypedefs.h" + > + RelativePath="..\readline\rlwinsize.h" + > + RelativePath="..\readline\savestring.c" + > + RelativePath="..\readline\search.c" + > + RelativePath="..\readline\shell.c" + > + RelativePath="..\readline\signals.c" + > + RelativePath="..\readline\tcap.h" + > + RelativePath="..\readline\terminal.c" + > + RelativePath="..\readline\text.c" + > + RelativePath="..\readline\tilde.c" + > + RelativePath="..\readline\tilde.h" + > + RelativePath="..\readline\undo.c" + > + RelativePath="..\readline\util.c" + > + RelativePath="..\readline\vi_keymap.c" + > + RelativePath="..\readline\vi_mode.c" + > + RelativePath="..\readline\xmalloc.c" + > + RelativePath="..\readline\xmalloc.h" + > diff --git a/MSVC/CD-Tool/CD-Tool.vcproj b/MSVC/CD-Tool/CD-Tool.vcproj index 30a2813..ef2c42c 100644 --- a/MSVC/CD-Tool/CD-Tool.vcproj +++ b/MSVC/CD-Tool/CD-Tool.vcproj @@ -1,21 +1,41 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + CharacterSet="2" + > + + + + + + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + + + + + + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> @@ -115,22 +171,24 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath="..\..\cd-tool.cpp" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > - - diff --git a/MSVC/Dalos/Dalos.vcproj b/MSVC/Dalos/Dalos.vcproj index ef4f9fa..57186c5 100644 --- a/MSVC/Dalos/Dalos.vcproj +++ b/MSVC/Dalos/Dalos.vcproj @@ -1,21 +1,41 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + CharacterSet="2" + > + + + + + + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + + + + + + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + /> + RelativePath="..\..\Dalos\Console.cc" + > + RelativePath="..\..\Dalos\Console.h" + > + RelativePath="..\..\Dalos\Dalos.cc" + > - - diff --git a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj index bae4ecf..0a749d6 100644 --- a/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj +++ b/MSVC/PSX-Bundle - library/PSX-Bundle - library.vcproj @@ -1,21 +1,41 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + CharacterSet="2" + > + + + + + + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/PSX-Bundle - library.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + + + + + + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/PSX-Bundle - library.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> @@ -102,126 +150,155 @@ + > + RelativePath="..\..\lib\lzss.cpp" + > + RelativePath="..\..\includes\lzss.h" + > + > + RelativePath="..\..\lib\cdabstract.cpp" + > + RelativePath="..\..\includes\cdabstract.h" + > + RelativePath="..\..\lib\cdreader.cpp" + > + RelativePath="..\..\includes\cdreader.h" + > + RelativePath="..\..\lib\cdutils.cpp" + > + RelativePath="..\..\includes\cdutils.h" + > + RelativePath="..\..\lib\isobuilder.cpp" + > + RelativePath="..\..\includes\isobuilder.h" + > + RelativePath="..\..\lib\luacd.cpp" + > + RelativePath="..\..\includes\luacd.h" + > + RelativePath="..\..\lib\yazedc.cpp" + > + RelativePath="..\..\includes\yazedc.h" + > + > + RelativePath="..\..\lib\luapsx.cpp" + > + RelativePath="..\..\includes\luapsx.h" + > + > + RelativePath="..\..\psxdev\bs.c" + > + RelativePath="..\..\psxdev\bs.h" + > + RelativePath="..\..\psxdev\common.h" + > + RelativePath="..\..\psxdev\idctfst.c" + > + RelativePath="..\..\psxdev\jfdctint.c" + > + RelativePath="..\..\psxdev\table.h" + > + RelativePath="..\..\psxdev\vlc.c" + > + RelativePath="..\..\psxdev\xadecode.c" + > + RelativePath="..\..\psxdev\xadecode.h" + > + > + RelativePath="..\..\FAQ.txt" + > + > + RelativePath="..\..\FAQ-cd.txt" + > + RelativePath="..\..\FAQ-lzss.txt" + > + RelativePath="..\..\FAQ-psx.txt" + > + > + RelativePath="..\..\EmuPatch-FAQ.txt" + > + RelativePath="..\..\FAQ-cd-fr.txt" + > - - diff --git a/MSVC/PSX-Bundle.sln b/MSVC/PSX-Bundle.sln index 048868b..25bd3ec 100644 --- a/MSVC/PSX-Bundle.sln +++ b/MSVC/PSX-Bundle.sln @@ -1,4 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +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 {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} = {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927} @@ -18,8 +19,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dalos", "Dalos\Dalos.vcproj EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Baltisot - generic", "Baltisot - generic\Baltisot - generic.vcproj", "{879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PSX-Bundle - library", "PSX-Bundle - library\PSX-Bundle - library.vcproj", "{0A2CD193-F270-4F2B-943C-F8BDF792D25C}" ProjectSection(ProjectDependencies) = postProject @@ -33,38 +32,37 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CD-Tool", "CD-Tool\CD-Tool. EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Debug.ActiveCfg = Debug|Win32 - {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Debug.Build.0 = Debug|Win32 - {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Release.ActiveCfg = Release|Win32 - {6CAE7F4D-C27B-43F3-B30A-84C5F32EFA29}.Release.Build.0 = Release|Win32 - {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Debug.ActiveCfg = Debug|Win32 - {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Debug.Build.0 = Debug|Win32 - {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Release.ActiveCfg = Release|Win32 - {34BCDA3E-D3E2-4A8D-BF73-7D770EE6966A}.Release.Build.0 = Release|Win32 - {22F8F8CD-B256-446D-9B42-09CE83F74885}.Debug.ActiveCfg = Debug|Win32 - {22F8F8CD-B256-446D-9B42-09CE83F74885}.Debug.Build.0 = Debug|Win32 - {22F8F8CD-B256-446D-9B42-09CE83F74885}.Release.ActiveCfg = Release|Win32 - {22F8F8CD-B256-446D-9B42-09CE83F74885}.Release.Build.0 = Release|Win32 - {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Debug.ActiveCfg = Debug|Win32 - {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Debug.Build.0 = Debug|Win32 - {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Release.ActiveCfg = Release|Win32 - {879D8D90-9A7E-4F3C-9B4E-F1648C8AE927}.Release.Build.0 = Release|Win32 - {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Debug.ActiveCfg = Debug|Win32 - {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Debug.Build.0 = Debug|Win32 - {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Release.ActiveCfg = Release|Win32 - {0A2CD193-F270-4F2B-943C-F8BDF792D25C}.Release.Build.0 = Release|Win32 - {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Debug.ActiveCfg = Debug|Win32 - {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Debug.Build.0 = Debug|Win32 - {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Release.ActiveCfg = Release|Win32 - {1AA995DB-BF26-4CCF-9D5B-D3AD698B8483}.Release.Build.0 = Release|Win32 + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution + 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 EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/MSVC/Tools/Tools.vcproj b/MSVC/Tools/Tools.vcproj index 55de511..2789e3b 100644 --- a/MSVC/Tools/Tools.vcproj +++ b/MSVC/Tools/Tools.vcproj @@ -1,36 +1,50 @@ + Keyword="MakeFileProj" + > + Name="Win32" + /> + + + ConfigurationType="0" + > + CleanCommandLine="nmake clean" + /> + + ConfigurationType="0" + > + CleanCommandLine="nmake clean" + /> + @@ -38,154 +52,197 @@ + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" + > + RelativePath="..\..\bgrep.cpp" + > + RelativePath="..\..\cd-tool.cpp" + > + RelativePath="..\..\cd-tool.lua" + > + RelativePath="..\..\crypto-search.cpp" + > + RelativePath="..\..\luapatch-languages.h" + > + RelativePath="..\..\luapatch-res.h" + > + RelativePath="..\..\luapatch.cpp" + > + RelativePath="..\..\luapatch.rc" + > + RelativePath="..\..\lzss-main.cpp" + > + RelativePath="..\..\testlua.lua" + > + > + RelativePath="..\..\Xenogears\compil.lex" + > + RelativePath="..\..\Xenogears\Decrypt.cpp" + > + RelativePath="..\..\Xenogears\main_dump.cpp" + > + RelativePath="..\..\Xenogears\nmakefile" + > + RelativePath="..\..\Xenogears\reinsert.cpp" + > + RelativePath="..\..\Xenogears\script-comp.cpp" + > + RelativePath="..\..\Xenogears\script-dec.cpp" + > + > + RelativePath="..\..\Xenogears\map2sqr" + > + RelativePath="..\..\Xenogears\XenoCD1.map" + > + RelativePath="..\..\Xenogears\XenoCD2.map" + > + Name="Global Makefiles" + > + RelativePath="makefile" + > + RelativePath="MakInDir.bat" + > + RelativePath="master.mak" + > + RelativePath="..\..\nmakefile" + > + > + RelativePath="..\..\PE\Aya.bmp" + > + RelativePath="..\..\PE\aya.ico" + > + RelativePath="..\..\PE\compil.lex" + > + RelativePath="..\..\PE\compilall.cpp" + > + RelativePath="..\..\PE\extract-rooms.cpp" + > + RelativePath="..\..\PE\extract-various.cpp" + > + RelativePath="..\..\PE\extract.cpp" + > + RelativePath="..\..\PE\nmakefile" + > + RelativePath="..\..\PE\pe-hack.lua" + > + RelativePath="..\..\PE\pepatch-res.h" + > + RelativePath="..\..\PE\pepatch.cpp" + > + RelativePath="..\..\PE\pepatch.rc" + > + RelativePath="..\..\PE\reinsert-res.h" + > + RelativePath="..\..\PE\reinsert.cpp" + > + RelativePath="..\..\PE\reinsert.h" + > + RelativePath="..\..\PE\reinsert.rc" + > + RelativePath="..\..\PE\table.h" + > + RelativePath="..\..\cdrom.ico" + > + DeploymentContent="TRUE" + > - - diff --git a/MSVC/Tools/master.mak b/MSVC/Tools/master.mak index 583f1eb..986dfe7 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 /DEFAULTLIB:AdvAPI32 +_LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /MACHINE:I386 /NODEFAULTLIB:LIBC /NODEFAULTLIB:LIBCMT /DEFAULTLIB:AdvAPI32 !ELSE -_LINK=link.exe /INCREMENTAL /NOLOGO /MACHINE:I386 /NODEFAULTLIB:LIBCD /DEFAULTLIB:AdvAPI32 +_LINK=link.exe /INCREMENTAL /NOLOGO /MACHINE:I386 /NODEFAULTLIB:LIBCD /NODEFAULTLIB:LIBCMTD /DEFAULTLIB:AdvAPI32 !ENDIF #this is used for compiling C# samples diff --git a/MSVC/mogltk/mogltk.vcproj b/MSVC/mogltk/mogltk.vcproj index c7a7d35..c0ef368 100644 --- a/MSVC/mogltk/mogltk.vcproj +++ b/MSVC/mogltk/mogltk.vcproj @@ -1,21 +1,41 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + + CharacterSet="2" + > + + + + + + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/mogltk.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + + + + + + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> - + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> - + Name="VCLibrarianTool" + OutputFile="$(OutDir)/mogltk.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> @@ -102,115 +150,139 @@ + > + RelativePath="..\..\mogltk\lib\base.cc" + > + RelativePath="..\..\mogltk\include\base.h" + > + RelativePath="..\..\mogltk\lib\glbase.cc" + > + RelativePath="..\..\mogltk\include\glbase.h" + > + > + RelativePath="..\..\mogltk\lib\engine.cc" + > + RelativePath="..\..\mogltk\include\engine.h" + > + > + RelativePath="..\..\mogltk\lib\font.cc" + > + RelativePath="..\..\mogltk\include\font.h" + > + RelativePath="..\..\mogltk\lib\glfont.cc" + > + RelativePath="..\..\mogltk\include\glfont.h" + > + > + RelativePath="..\..\mogltk\lib\mcolor.cc" + > + RelativePath="..\..\mogltk\include\mcolor.h" + > + > + RelativePath="..\..\mogltk\lib\glshape.cc" + > + RelativePath="..\..\mogltk\include\glshape.h" + > + RelativePath="..\..\mogltk\lib\shape.cc" + > + RelativePath="..\..\mogltk\include\shape.h" + > + > + RelativePath="..\..\mogltk\lib\glsprite.cc" + > + RelativePath="..\..\mogltk\include\glsprite.h" + > + RelativePath="..\..\mogltk\lib\sprite.cc" + > + RelativePath="..\..\mogltk\include\sprite.h" + > + > + RelativePath="..\..\mogltk\lib\texture.cc" + > + RelativePath="..\..\mogltk\include\texture.h" + > + > + RelativePath="..\..\mogltk\lib\glwidgets.cc" + > + RelativePath="..\..\mogltk\include\glwidgets.h" + > + RelativePath="..\..\mogltk\lib\widgets.cc" + > + RelativePath="..\..\mogltk\include\widgets.h" + > - - -- cgit v1.2.3