diff --git a/AppleWinExpress2019.sln b/AppleWinExpress2019.sln index c8367f19..31f25485 100644 --- a/AppleWinExpress2019.sln +++ b/AppleWinExpress2019.sln @@ -25,57 +25,83 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug NoDX|Win32 = Debug NoDX|Win32 + Debug v141_xp|Win32 = Debug v141_xp|Win32 Debug|Win32 = Debug|Win32 Release NoDX|Win32 = Release NoDX|Win32 + Release v141_xp|Win32 = Release v141_xp|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0A960136-A00A-4D4B-805F-664D9950D2CA}.Debug NoDX|Win32.ActiveCfg = Debug NoDX|Win32 {0A960136-A00A-4D4B-805F-664D9950D2CA}.Debug NoDX|Win32.Build.0 = Debug NoDX|Win32 + {0A960136-A00A-4D4B-805F-664D9950D2CA}.Debug v141_xp|Win32.ActiveCfg = Debug v141_xp|Win32 + {0A960136-A00A-4D4B-805F-664D9950D2CA}.Debug v141_xp|Win32.Build.0 = Debug v141_xp|Win32 {0A960136-A00A-4D4B-805F-664D9950D2CA}.Debug|Win32.ActiveCfg = Debug|Win32 {0A960136-A00A-4D4B-805F-664D9950D2CA}.Debug|Win32.Build.0 = Debug|Win32 {0A960136-A00A-4D4B-805F-664D9950D2CA}.Release NoDX|Win32.ActiveCfg = Release NoDX|Win32 {0A960136-A00A-4D4B-805F-664D9950D2CA}.Release NoDX|Win32.Build.0 = Release NoDX|Win32 + {0A960136-A00A-4D4B-805F-664D9950D2CA}.Release v141_xp|Win32.ActiveCfg = Release v141_xp|Win32 + {0A960136-A00A-4D4B-805F-664D9950D2CA}.Release v141_xp|Win32.Build.0 = Release v141_xp|Win32 {0A960136-A00A-4D4B-805F-664D9950D2CA}.Release|Win32.ActiveCfg = Release|Win32 {0A960136-A00A-4D4B-805F-664D9950D2CA}.Release|Win32.Build.0 = Release|Win32 {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Debug NoDX|Win32.ActiveCfg = Debug|Win32 {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Debug NoDX|Win32.Build.0 = Debug|Win32 + {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Debug v141_xp|Win32.ActiveCfg = Debug v141_xp|Win32 + {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Debug v141_xp|Win32.Build.0 = Debug v141_xp|Win32 {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Debug|Win32.ActiveCfg = Debug|Win32 {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Debug|Win32.Build.0 = Debug|Win32 {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Release NoDX|Win32.ActiveCfg = Release|Win32 {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Release NoDX|Win32.Build.0 = Release|Win32 + {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Release v141_xp|Win32.ActiveCfg = Release v141_xp|Win32 + {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Release v141_xp|Win32.Build.0 = Release v141_xp|Win32 {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Release|Win32.ActiveCfg = Release|Win32 {509739E7-0AF3-4C09-A1A9-F0B1BC31B39D}.Release|Win32.Build.0 = Release|Win32 {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Debug NoDX|Win32.ActiveCfg = Debug|Win32 {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Debug NoDX|Win32.Build.0 = Debug|Win32 + {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Debug v141_xp|Win32.ActiveCfg = Debug v141_xp|Win32 + {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Debug v141_xp|Win32.Build.0 = Debug v141_xp|Win32 {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Debug|Win32.ActiveCfg = Debug|Win32 {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Debug|Win32.Build.0 = Debug|Win32 {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Release NoDX|Win32.ActiveCfg = Release|Win32 {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Release NoDX|Win32.Build.0 = Release|Win32 + {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Release v141_xp|Win32.ActiveCfg = Release v141_xp|Win32 + {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Release v141_xp|Win32.Build.0 = Release v141_xp|Win32 {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Release|Win32.ActiveCfg = Release|Win32 {9B32A6E7-1237-4F36-8903-A3FD51DF9C4E}.Release|Win32.Build.0 = Release|Win32 {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Debug NoDX|Win32.ActiveCfg = Debug|Win32 {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Debug NoDX|Win32.Build.0 = Debug|Win32 + {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Debug v141_xp|Win32.ActiveCfg = Debug v141_xp|Win32 + {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Debug v141_xp|Win32.Build.0 = Debug v141_xp|Win32 {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Debug|Win32.ActiveCfg = Debug|Win32 {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Debug|Win32.Build.0 = Debug|Win32 {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Release NoDX|Win32.ActiveCfg = Release|Win32 {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Release NoDX|Win32.Build.0 = Release|Win32 + {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Release v141_xp|Win32.ActiveCfg = Release v141_xp|Win32 + {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Release v141_xp|Win32.Build.0 = Release v141_xp|Win32 {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Release|Win32.ActiveCfg = Release|Win32 {0212E0DF-06DA-4080-BD1D-F3B01599F70F}.Release|Win32.Build.0 = Release|Win32 {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Debug NoDX|Win32.ActiveCfg = Debug|Win32 {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Debug NoDX|Win32.Build.0 = Debug|Win32 + {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Debug v141_xp|Win32.ActiveCfg = Debug v141_xp|Win32 + {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Debug v141_xp|Win32.Build.0 = Debug v141_xp|Win32 {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Debug|Win32.ActiveCfg = Debug|Win32 {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Debug|Win32.Build.0 = Debug|Win32 {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Release NoDX|Win32.ActiveCfg = Release|Win32 {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Release NoDX|Win32.Build.0 = Release|Win32 + {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Release v141_xp|Win32.ActiveCfg = Release v141_xp|Win32 + {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Release v141_xp|Win32.Build.0 = Release v141_xp|Win32 {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Release|Win32.ActiveCfg = Release|Win32 {CF5A49BF-62A5-41BB-B10C-F34D556A7A45}.Release|Win32.Build.0 = Release|Win32 {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Debug NoDX|Win32.ActiveCfg = Debug|Win32 {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Debug NoDX|Win32.Build.0 = Debug|Win32 + {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Debug v141_xp|Win32.ActiveCfg = Debug v141_xp|Win32 + {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Debug v141_xp|Win32.Build.0 = Debug v141_xp|Win32 {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Debug|Win32.ActiveCfg = Debug|Win32 {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Debug|Win32.Build.0 = Debug|Win32 {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Release NoDX|Win32.ActiveCfg = Release|Win32 {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Release NoDX|Win32.Build.0 = Release|Win32 + {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Release v141_xp|Win32.ActiveCfg = Release v141_xp|Win32 + {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Release v141_xp|Win32.Build.0 = Release v141_xp|Win32 {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Release|Win32.ActiveCfg = Release|Win32 {AA5854AD-2BC7-4EFD-9790-349ADB35E35A}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/AppleWinExpress2019.vcxproj b/AppleWinExpress2019.vcxproj index 9d359ab2..7b5778ee 100644 --- a/AppleWinExpress2019.vcxproj +++ b/AppleWinExpress2019.vcxproj @@ -5,6 +5,10 @@ Debug NoDX Win32 + + Debug v141_xp + Win32 + Debug Win32 @@ -13,6 +17,10 @@ Release NoDX Win32 + + Release v141_xp + Win32 + Release Win32 @@ -188,34 +196,44 @@ Create + Create Create Create + Create Create NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing @@ -228,20 +246,26 @@ NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing NotUsing + NotUsing NotUsing @@ -325,6 +349,7 @@ Win32Proj AppleWin AppleWin + 10.0 @@ -333,6 +358,12 @@ v142 MultiByte + + Application + true + v141_xp + MultiByte + Application true @@ -346,6 +377,13 @@ false MultiByte + + Application + false + v141_xp + false + MultiByte + Application false @@ -359,12 +397,18 @@ + + + + + + @@ -372,12 +416,18 @@ true + + true + true false + + false + false @@ -402,6 +452,34 @@ echo Performing unit-test: TestCPU6502 +.\Debug\TestCPU6502.exe + + + Performing unit-test: TestCPU6502 + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;NO_DSHOW_STRSAFE;YAML_DECLARE_STATIC;%(PreprocessorDefinitions) + true + source;source\cpu;source\debugger;zlib;zip_lib;libyaml\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + /utf-8 %(AdditionalOptions) + Default + 4995 + + + Windows + true + htmlhelp.lib;comctl32.lib;winmm.lib;dsound.lib;ddraw_lib\x86\dxguid.lib;version.lib;strmiids.lib;dinput8.lib;user32.lib;gdi32.lib;advapi32.lib;shell32.lib;comdlg32.lib;ole32.lib;wsock32.lib;ddraw_lib\x86\ddraw.lib;%(AdditionalDependencies) + "type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" + 5.01 + + + echo Performing unit-test: TestCPU6502 .\Debug\TestCPU6502.exe @@ -460,6 +538,39 @@ echo Performing unit-test: TestCPU6502 +.\Release\TestCPU6502.exe + + + Performing unit-test: TestCPU6502 + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;NO_DSHOW_STRSAFE;YAML_DECLARE_STATIC;%(PreprocessorDefinitions) + true + source;source\cpu;source\debugger;zlib;zip_lib;libyaml\include;%(AdditionalIncludeDirectories) + MultiThreaded + Speed + /utf-8 %(AdditionalOptions) + 4995 + + + Windows + true + true + true + htmlhelp.lib;comctl32.lib;winmm.lib;dsound.lib;ddraw_lib\x86\dxguid.lib;version.lib;strmiids.lib;dinput8.lib;user32.lib;gdi32.lib;advapi32.lib;shell32.lib;comdlg32.lib;ole32.lib;wsock32.lib;ddraw_lib\x86\ddraw.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + "type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" + 5.01 + + + echo Performing unit-test: TestCPU6502 .\Release\TestCPU6502.exe diff --git a/HookFilter/HookFilter-vs2019.vcxproj b/HookFilter/HookFilter-vs2019.vcxproj index 151c8605..ea9912b2 100644 --- a/HookFilter/HookFilter-vs2019.vcxproj +++ b/HookFilter/HookFilter-vs2019.vcxproj @@ -1,10 +1,18 @@  + + Debug v141_xp + Win32 + Debug Win32 + + Release v141_xp + Win32 + Release Win32 @@ -15,6 +23,7 @@ {AA5854AD-2BC7-4EFD-9790-349ADB35E35A} HookFilter Win32Proj + 10.0 @@ -23,20 +32,37 @@ Unicode true + + DynamicLibrary + v141_xp + Unicode + true + DynamicLibrary v142 Unicode + + DynamicLibrary + v141_xp + Unicode + + + + + + + <_ProjectFileVersion>15.0.26419.1 @@ -46,11 +72,21 @@ $(Configuration)\ true + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ $(Configuration)\ false + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + Disabled @@ -68,6 +104,25 @@ + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;HOOKFILTER_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Windows + MachineX86 + + + + MaxSpeed @@ -87,6 +142,28 @@ MachineX86 + + + MaxSpeed + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;HOOKFILTER_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + + + true + Windows + true + true + MachineX86 + + diff --git a/libyaml/win32/yaml2019.vcxproj b/libyaml/win32/yaml2019.vcxproj index 890a1f7f..a331f393 100644 --- a/libyaml/win32/yaml2019.vcxproj +++ b/libyaml/win32/yaml2019.vcxproj @@ -1,10 +1,18 @@  + + Debug v141_xp + Win32 + Debug Win32 + + Release v141_xp + Win32 + Release Win32 @@ -34,6 +42,7 @@ Win32Proj yaml2013 yaml + 10.0 @@ -42,6 +51,12 @@ v142 MultiByte + + StaticLibrary + true + v141_xp + MultiByte + StaticLibrary false @@ -49,15 +64,28 @@ true MultiByte + + StaticLibrary + false + v141_xp + true + MultiByte + + + + + + + @@ -75,6 +103,21 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;YAML_DECLARE_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .;../include + MultiThreadedDebug + + + Windows + true + + Level3 @@ -94,6 +137,25 @@ true + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;YAML_DECLARE_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + .;../include + MultiThreaded + + + Windows + true + true + true + + diff --git a/source/StdAfx.h b/source/StdAfx.h index 1e9ba179..75c7437b 100644 --- a/source/StdAfx.h +++ b/source/StdAfx.h @@ -1,20 +1,3 @@ -//#define WIN32_LEAN_AND_MEAN - -// Required for Win98/ME support: -// . See: http://support.embarcadero.com/article/35754 -// . "GetOpenFileName() fails under Windows 95/98/NT/ME due to incorrect OPENFILENAME structure size" -#define _WIN32_WINNT 0x0400 -#define WINVER 0x500 - -// Mouse Wheel is not supported on Win95. -// If we didn't care about supporting Win95 (compile/run-time errors) -// we would just define the minimum windows version to support. -// #define _WIN32_WINDOWS 0x0401 -#ifndef WM_MOUSEWHEEL -#define WM_MOUSEWHEEL 0x020A -#endif - -// Not needed in VC7.1, but needed in VC Express #include #include diff --git a/test/TestCPU6502/TestCPU6502-vs2019.vcxproj b/test/TestCPU6502/TestCPU6502-vs2019.vcxproj index 0454719d..f3778e1f 100644 --- a/test/TestCPU6502/TestCPU6502-vs2019.vcxproj +++ b/test/TestCPU6502/TestCPU6502-vs2019.vcxproj @@ -1,10 +1,18 @@  + + Debug v141_xp + Win32 + Debug Win32 + + Release v141_xp + Win32 + Release Win32 @@ -23,6 +31,7 @@ Win32Proj TestCPU6502vs2013 TestCPU6502 + 10.0 @@ -31,6 +40,12 @@ v142 Unicode + + Application + true + v141_xp + Unicode + Application false @@ -38,22 +53,41 @@ true Unicode + + Application + false + v141_xp + true + Unicode + + + + + + + true + + true + false + + false + @@ -67,6 +101,20 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + 4995 + + + Console + true + + Level3 @@ -76,6 +124,26 @@ true true WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + + + + + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + 4995 Console diff --git a/zip_lib/zip_lib2019.vcxproj b/zip_lib/zip_lib2019.vcxproj index d5fc30eb..24550686 100644 --- a/zip_lib/zip_lib2019.vcxproj +++ b/zip_lib/zip_lib2019.vcxproj @@ -1,10 +1,18 @@  + + Debug v141_xp + Win32 + Debug Win32 + + Release v141_xp + Win32 + Release Win32 @@ -30,6 +38,7 @@ Win32Proj zip_lib zip_lib + 10.0 @@ -38,6 +47,12 @@ v142 MultiByte + + StaticLibrary + true + v141_xp + MultiByte + StaticLibrary false @@ -45,15 +60,28 @@ true MultiByte + + StaticLibrary + false + v141_xp + true + MultiByte + + + + + + + @@ -71,6 +99,21 @@ true + + + NotUsing + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + ..\zlib;%(AdditionalIncludeDirectories) + MultiThreadedDebug + + + Windows + true + + Level3 @@ -90,6 +133,25 @@ true + + + Level3 + NotUsing + MaxSpeed + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + ..\zlib;%(AdditionalIncludeDirectories) + MultiThreaded + + + Windows + true + true + true + + diff --git a/zlib/zlib-Express2019.vcxproj b/zlib/zlib-Express2019.vcxproj index 4399f425..863e4387 100644 --- a/zlib/zlib-Express2019.vcxproj +++ b/zlib/zlib-Express2019.vcxproj @@ -1,10 +1,18 @@  + + Debug v141_xp + Win32 + Debug Win32 + + Release v141_xp + Win32 + Release Win32 @@ -45,6 +53,7 @@ Win32Proj zlib zlib + 10.0 @@ -53,6 +62,12 @@ v142 MultiByte + + StaticLibrary + true + v141_xp + MultiByte + StaticLibrary false @@ -60,15 +75,28 @@ true MultiByte + + StaticLibrary + false + v141_xp + true + MultiByte + + + + + + + @@ -85,6 +113,20 @@ true + + + NotUsing + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreadedDebug + + + Windows + true + + Level3 @@ -103,6 +145,24 @@ true + + + Level3 + NotUsing + MaxSpeed + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + MultiThreaded + + + Windows + true + true + true + +