From e6250f391c1fe25a4a2fda24f604513c7c9ea209 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Fri, 12 Jul 2019 19:42:13 +0300 Subject: [PATCH] Config updates (2019) --- od-win32/build68k_msvc/build68k_msvc.vcxproj | 76 ++++- .../genblitter_msvc/genblitter_msvc.vcxproj | 78 ++++- od-win32/gencomp_msvc/gencomp_msvc.vcxproj | 71 ++++- od-win32/gencpu_msvc/gencpu_msvc.vcxproj | 79 ++++- .../genlinetoscr_msvc.vcxproj | 62 +++- od-win32/prowizard/prowizard.vcxproj | 100 +++++- od-win32/uaeunp/uaeunp.vcxproj | 53 +++- od-win32/unpackers/unpackers.vcxproj | 90 +++++- od-win32/winuae_msvc15/winuae_msvc.sln | 144 ++++----- od-win32/winuae_msvc15/winuae_msvc.vcxproj | 300 ++++++++++++++++-- .../winuae_msvc15/winuae_msvc.vcxproj.filters | 15 - 11 files changed, 921 insertions(+), 147 deletions(-) diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj b/od-win32/build68k_msvc/build68k_msvc.vcxproj index ce019a74..4d6260e8 100644 --- a/od-win32/build68k_msvc/build68k_msvc.vcxproj +++ b/od-win32/build68k_msvc/build68k_msvc.vcxproj @@ -9,6 +9,10 @@ FullRelease Win32 + + ReleaseXP + Win32 + Release Win32 @@ -31,36 +35,43 @@ Application false - MultiByte - v141 + Unicode + v142 false Application false - MultiByte - v141 + Unicode + v142 false Application false Unicode - v141 + v142 false Application false Unicode - v141 + v142 + false + + + Application + false + Unicode + v142 false Application false Unicode - v141 + v142 false @@ -78,6 +89,9 @@ + + + @@ -85,10 +99,13 @@ <_ProjectFileVersion>10.0.30128.1 .\Release\ + .\Release\ .\Release\ .\Release\ + .\Release\ .\Release\ false + false false .\Debug\ .\Debug\ @@ -142,6 +159,51 @@ creating cpudefs.cpp build68k.exe >..\..\cpudefs.cpp <..\..\table68k del build68k.exe + + + + + + .\Release/build68k_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/build68k_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting cpudefs.cpp + del ..\..\cpudefs.cpp + + + /MACHINE:I386 %(AdditionalOptions) + build68k.exe + true + .\Release/build68k.pdb + Console + false + + + + + creating cpudefs.cpp + build68k.exe >..\..\cpudefs.cpp <..\..\table68k +del build68k.exe diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj index afa47214..1ed6fc6c 100644 --- a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj +++ b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj @@ -9,6 +9,10 @@ FullRelease Win32 + + ReleaseXP + Win32 + Release Win32 @@ -32,35 +36,42 @@ Application false MultiByte - v141 + v142 false Application false MultiByte - v141 + v142 false Application false Unicode - v141 + v142 false Application false Unicode - v141 + v142 + false + + + Application + false + Unicode + v142 false Application false Unicode - v141 + v142 false @@ -78,6 +89,9 @@ + + + @@ -85,10 +99,13 @@ <_ProjectFileVersion>10.0.30128.1 .\Release\ + .\Release\ .\Release\ .\Release\ + .\Release\ .\Release\ false + false false .\Debug\ .\Debug\ @@ -148,6 +165,57 @@ genblitter.exe f >..\..\blitfunc.cpp genblitter.exe h >..\..\blitfunc.h genblitter.exe t >..\..\blittable.cpp del genblitter.exe + + + + + + .\Release/genblitter_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/genblitter_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting blitter files + del ..\..\blit.h +del ..\..\blitfunc.cpp +del ..\..\blitfunc.h +del ..\..\blittable.cpp + + + /MACHINE:I386 %(AdditionalOptions) + genblitter.exe + true + .\Release/genblitter.pdb + Console + false + + + + + generating blitter files + genblitter.exe i >..\..\blit.h +genblitter.exe f >..\..\blitfunc.cpp +genblitter.exe h >..\..\blitfunc.h +genblitter.exe t >..\..\blittable.cpp +del genblitter.exe diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj index 73a075bb..b870013e 100644 --- a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj +++ b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj @@ -9,6 +9,10 @@ FullRelease Win32 + + ReleaseXP + Win32 + Release Win32 @@ -32,21 +36,21 @@ Application false Unicode - v141 + v142 false Application false MultiByte - v141 + v142 false Application false Unicode - v141 + v142 false @@ -54,7 +58,15 @@ false false Unicode - v141 + v142 + false + + + Application + false + false + Unicode + v142 false @@ -62,7 +74,7 @@ false false Unicode - v141 + v142 false @@ -80,6 +92,9 @@ + + + @@ -87,10 +102,13 @@ <_ProjectFileVersion>10.0.30128.1 .\Release\ + .\Release\ .\Release\ .\Release\ + .\Release\ .\Release\ false + false false .\Debug\ .\Debug\ @@ -142,6 +160,49 @@ od-win32\gencomp_msvc\gencomp.exe del od-win32\gencomp_msvc\gencomp.exe + + + + + + .\Release/gencomp_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + UAE;WINUAE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/gencomp_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + gencomp.exe + true + .\Release/gencomp.pdb + Console + false + + + + + generating gencomp files + cd ..\.. +od-win32\gencomp_msvc\gencomp.exe +del od-win32\gencomp_msvc\gencomp.exe + diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj index d59d30c8..eb1eb6d3 100644 --- a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj +++ b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj @@ -9,6 +9,10 @@ FullRelease Win32 + + ReleaseXP + Win32 + Release Win32 @@ -32,35 +36,42 @@ Application false Unicode - v141 + v142 false Application false MultiByte - v141 + v142 false Application false Unicode - v141 + v142 + false + + + Application + false + Unicode + v142 false Application false Unicode - v141 + v142 false Application false Unicode - v141 + v142 false @@ -75,6 +86,9 @@ + + + @@ -88,12 +102,16 @@ .\Debug\ true .\Release\ + .\Release\ .\Release\ .\Release\ + .\Release\ .\Release\ false + false false false + false false $(Configuration)\ $(Configuration)\ @@ -181,6 +199,57 @@ del ..\..\cpustbl.cpp del ..\..\cpuemu.cpp + + + + /MACHINE:I386 %(AdditionalOptions) + gencpu.exe + true + .\Release/gencpu.pdb + Console + false + + + + + generating gencpu files + cd ..\.. +od-win32\gencpu_msvc\gencpu.exe +del od-win32\gencpu_msvc\gencpu.exe + + + + + + .\Release/gencpu_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/gencpu_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + Cdecl + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting gencpu files + del ..\..\cputbl.h +del ..\..\cpustbl.cpp +del ..\..\cpuemu.cpp + diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj index cf3dc296..f81f9606 100644 --- a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj +++ b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj @@ -9,6 +9,10 @@ FullRelease Win32 + + ReleaseXP + Win32 + Release Win32 @@ -30,27 +34,34 @@ Application Unicode true - v141 + v142 false Application Unicode true - v141 + v142 + false + + + Application + Unicode + true + v142 false Application Unicode true - v141 + v142 false Application Unicode - v141 + v142 false @@ -62,6 +73,9 @@ + + + @@ -75,10 +89,13 @@ $(Configuration)\ true $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ false + false false $(SolutionDir)$(Configuration)\ $(Configuration)\ @@ -139,6 +156,43 @@ generating linetoscr.c genlinetoscr.exe >..\..\linetoscr.cpp del genlinetoscr.exe + + + + + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;..\ + + + deleteing linetoscr.cpp + del ..\..\linetoscr.cpp + + + + genlinetoscr.exe + true + Console + true + true + false + + + MachineX86 + + + generating linetoscr.c + genlinetoscr.exe >..\..\linetoscr.cpp +del genlinetoscr.exe diff --git a/od-win32/prowizard/prowizard.vcxproj b/od-win32/prowizard/prowizard.vcxproj index 810f12ac..39527828 100644 --- a/od-win32/prowizard/prowizard.vcxproj +++ b/od-win32/prowizard/prowizard.vcxproj @@ -9,6 +9,14 @@ Debug x64 + + ReleaseXP + Win32 + + + ReleaseXP + x64 + Release Win32 @@ -38,38 +46,51 @@ StaticLibrary Unicode false - v141_xp + v142 + false + + + StaticLibrary + Unicode + false + v142 false StaticLibrary Unicode false - v141_xp + v142 false StaticLibrary Unicode - v141 + v142 false StaticLibrary Unicode true - v141 + v142 + + + StaticLibrary + Unicode + true + v142 StaticLibrary Unicode true - v141 + v142 StaticLibrary Unicode - v141 + v142 @@ -77,6 +98,9 @@ + + + @@ -86,6 +110,9 @@ + + + @@ -98,16 +125,21 @@ $(SolutionDir)$(Configuration)\..\..\lib\ $(Configuration)\ $(SolutionDir)$(Configuration)\..\..\lib\ + $(SolutionDir)$(Configuration)\..\..\lib\ $(SolutionDir)$(Configuration)\..\..\lib\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ + $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ $(ProjectName)_x64 + $(ProjectName)_x64 $(ProjectName)_x64 @@ -156,6 +188,33 @@ false + + + MaxSpeed + true + false + ..\..\prowizard\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + false + true + + + Level3 + ProgramDatabase + FastCall + Default + 4996;%(DisableSpecificWarnings) + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + false + + MaxSpeed @@ -228,6 +287,35 @@ false + + + X64 + + + MaxSpeed + true + false + ..\..\prowizard\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + false + true + + + Level3 + ProgramDatabase + FastCall + Default + 4996;%(DisableSpecificWarnings) + + + $(OutDir)$(TargetName)$(TargetExt) + + + prowizard_search;%(ExportNamedFunctions) + false + + X64 diff --git a/od-win32/uaeunp/uaeunp.vcxproj b/od-win32/uaeunp/uaeunp.vcxproj index cf5ba802..693a282b 100644 --- a/od-win32/uaeunp/uaeunp.vcxproj +++ b/od-win32/uaeunp/uaeunp.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + ReleaseXP + Win32 + Release Win32 @@ -25,20 +29,27 @@ Application Unicode true - v141 + v142 + false + + + Application + Unicode + true + v142 false Application Unicode true - v141 + v142 false Application Unicode - v141 + v142 false @@ -47,6 +58,9 @@ + + + @@ -60,14 +74,19 @@ $(Configuration)\ true d:\amiga\ + d:\amiga\ d:\amiga\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ false + false false C:\dev\include;$(IncludePath) + C:\dev\include;$(IncludePath) C:\dev\include;$(IncludePath) C:\dev\lib;$(LibraryPath) + C:\dev\lib;$(LibraryPath) C:\dev\lib;$(LibraryPath) C:\dev\include;$(IncludePath) C:\dev\lib;$(LibraryPath) @@ -125,6 +144,34 @@ $(SolutionDir)\..\lib\ + + + MaxSpeed + true + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\tun;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;WIN32_IE=0x0700;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + true + + + Level3 + ProgramDatabase + StdCall + true + Sync + false + + + Shlwapi.lib;zlibstat.lib;wininet.lib;lzmalib.lib;%(AdditionalDependencies) + wininet.dll;%(DelayLoadDLLs) + true + Console + true + true + MachineX86 + $(SolutionDir)\..\lib\ + + MaxSpeed diff --git a/od-win32/unpackers/unpackers.vcxproj b/od-win32/unpackers/unpackers.vcxproj index 305fa1e7..3a19262e 100644 --- a/od-win32/unpackers/unpackers.vcxproj +++ b/od-win32/unpackers/unpackers.vcxproj @@ -9,6 +9,14 @@ Debug x64 + + ReleaseXP + Win32 + + + ReleaseXP + x64 + Release Win32 @@ -37,41 +45,55 @@ StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary false false Unicode - v141 + v142 + + + StaticLibrary + false + false + Unicode + v142 StaticLibrary false false Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 + + + StaticLibrary + false + true + Unicode + v142 StaticLibrary false true Unicode - v141 + v142 @@ -85,12 +107,18 @@ + + + + + + @@ -98,6 +126,9 @@ $(SolutionDir)$(Configuration)\..\..\lib\ + + $(SolutionDir)$(Configuration)\..\..\lib\ + $(SolutionDir)$(Configuration)\..\..\lib\ @@ -105,6 +136,10 @@ $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ $(ProjectName)_x64 + + $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ + $(ProjectName)_x64 + $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ $(ProjectName)_x64 @@ -174,6 +209,30 @@ + + + Level3 + NotUsing + MaxSpeed + true + true + WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;%(PreprocessorDefinitions) + MultiThreaded + StdCall + ..\..\include;..\;%(AdditionalIncludeDirectories) + false + + + Windows + true + true + true + + + + + + Level3 @@ -217,6 +276,25 @@ true + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + StdCall + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + Level3 diff --git a/od-win32/winuae_msvc15/winuae_msvc.sln b/od-win32/winuae_msvc15/winuae_msvc.sln index d71caa2c..d9daf5a4 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.sln +++ b/od-win32/winuae_msvc15/winuae_msvc.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.12 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28922.388 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winuae", "winuae_msvc.vcxproj", "{4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}" EndProject @@ -36,26 +36,20 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "wix", "..\wix\wix.wixproj", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 FullRelease|Mixed Platforms = FullRelease|Mixed Platforms FullRelease|Win32 = FullRelease|Win32 FullRelease|x64 = FullRelease|x64 Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x64 = Release|x64 + ReleaseXP|Mixed Platforms = ReleaseXP|Mixed Platforms + ReleaseXP|Win32 = ReleaseXP|Win32 + ReleaseXP|x64 = ReleaseXP|x64 Test|Mixed Platforms = Test|Mixed Platforms Test|Win32 = Test|Win32 Test|x64 = Test|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Win32.ActiveCfg = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Win32.Build.0 = Debug|Win32 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x64.ActiveCfg = Debug|x64 - {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x64.Build.0 = Debug|x64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 @@ -68,16 +62,18 @@ Global {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Win32.Build.0 = Release|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.ActiveCfg = Release|x64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.Build.0 = Release|x64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.ReleaseXP|x64.Build.0 = ReleaseXP|x64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Mixed Platforms.Build.0 = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Win32.ActiveCfg = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Win32.Build.0 = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x64.ActiveCfg = Test|x64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x64.Build.0 = Test|x64 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Win32.ActiveCfg = Debug|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x64.ActiveCfg = Debug|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 @@ -86,14 +82,14 @@ Global {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Mixed Platforms.Build.0 = Release|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Win32.ActiveCfg = Release|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x64.ActiveCfg = Release|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Mixed Platforms.Build.0 = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Win32.ActiveCfg = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|x64.ActiveCfg = Test|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Win32.ActiveCfg = Debug|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x64.ActiveCfg = Debug|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 @@ -102,14 +98,14 @@ Global {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Mixed Platforms.Build.0 = Release|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Win32.ActiveCfg = Release|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x64.ActiveCfg = Release|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Mixed Platforms.Build.0 = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Win32.ActiveCfg = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|x64.ActiveCfg = Test|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Win32.ActiveCfg = Debug|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x64.ActiveCfg = Debug|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 @@ -118,14 +114,14 @@ Global {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Mixed Platforms.Build.0 = Release|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Win32.ActiveCfg = Release|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x64.ActiveCfg = Release|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Mixed Platforms.Build.0 = Test|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Win32.ActiveCfg = Test|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|x64.ActiveCfg = Test|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Win32.ActiveCfg = Debug|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x64.ActiveCfg = Debug|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 @@ -134,14 +130,14 @@ Global {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Mixed Platforms.Build.0 = Release|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Win32.ActiveCfg = Release|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x64.ActiveCfg = Release|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Mixed Platforms.Build.0 = Test|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Win32.ActiveCfg = Test|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|x64.ActiveCfg = Test|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|Win32.ActiveCfg = Debug|Win32 - {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Debug|x64.ActiveCfg = Debug|Win32 {DAF2EB1A-546A-41B3-9755-187562C01E3C}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 {DAF2EB1A-546A-41B3-9755-187562C01E3C}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {DAF2EB1A-546A-41B3-9755-187562C01E3C}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 @@ -150,14 +146,14 @@ Global {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|Mixed Platforms.Build.0 = Release|Win32 {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|Win32.ActiveCfg = Release|Win32 {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Release|x64.ActiveCfg = Release|Win32 + {DAF2EB1A-546A-41B3-9755-187562C01E3C}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {DAF2EB1A-546A-41B3-9755-187562C01E3C}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {DAF2EB1A-546A-41B3-9755-187562C01E3C}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {DAF2EB1A-546A-41B3-9755-187562C01E3C}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Test|Mixed Platforms.Build.0 = Test|Win32 {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Test|Win32.ActiveCfg = Test|Win32 {DAF2EB1A-546A-41B3-9755-187562C01E3C}.Test|x64.ActiveCfg = Test|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Win32.ActiveCfg = Debug|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x64.ActiveCfg = Debug|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 @@ -166,14 +162,14 @@ Global {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Mixed Platforms.Build.0 = Release|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Win32.ActiveCfg = Release|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x64.ActiveCfg = Release|Win32 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Mixed Platforms.Build.0 = Test|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Win32.ActiveCfg = Test|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|x64.ActiveCfg = Test|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|Win32.ActiveCfg = Debug|Win32 - {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Debug|x64.ActiveCfg = Debug|Win32 {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 @@ -182,14 +178,14 @@ Global {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|Mixed Platforms.Build.0 = Release|Win32 {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|Win32.ActiveCfg = Release|Win32 {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Release|x64.ActiveCfg = Release|Win32 + {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Test|Mixed Platforms.Build.0 = Test|Win32 {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Test|Win32.ActiveCfg = Test|Win32 {960E83B5-9118-4EBD-AF50-18EFC1DC764B}.Test|x64.ActiveCfg = Test|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|Win32.ActiveCfg = Debug|Win32 - {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Debug|x64.ActiveCfg = Debug|Win32 {79BDABE6-5308-4D64-8884-A5A35909D8D3}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 {79BDABE6-5308-4D64-8884-A5A35909D8D3}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {79BDABE6-5308-4D64-8884-A5A35909D8D3}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 @@ -198,14 +194,14 @@ Global {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|Mixed Platforms.Build.0 = Release|Win32 {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|Win32.ActiveCfg = Release|Win32 {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Release|x64.ActiveCfg = Release|Win32 + {79BDABE6-5308-4D64-8884-A5A35909D8D3}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {79BDABE6-5308-4D64-8884-A5A35909D8D3}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {79BDABE6-5308-4D64-8884-A5A35909D8D3}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {79BDABE6-5308-4D64-8884-A5A35909D8D3}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Test|Mixed Platforms.Build.0 = Test|Win32 {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Test|Win32.ActiveCfg = Test|Win32 {79BDABE6-5308-4D64-8884-A5A35909D8D3}.Test|x64.ActiveCfg = Test|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Win32.ActiveCfg = Debug|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x64.ActiveCfg = Debug|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 @@ -214,14 +210,14 @@ Global {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Mixed Platforms.Build.0 = Release|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Win32.ActiveCfg = Release|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x64.ActiveCfg = Release|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Mixed Platforms.Build.0 = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Win32.ActiveCfg = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|x64.ActiveCfg = Test|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|Win32.ActiveCfg = Debug|Win32 - {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Debug|x64.ActiveCfg = Debug|Win32 {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.FullRelease|Mixed Platforms.ActiveCfg = Release|Win32 {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.FullRelease|Mixed Platforms.Build.0 = Release|Win32 {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.FullRelease|Win32.ActiveCfg = Release|Win32 @@ -230,14 +226,14 @@ Global {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|Mixed Platforms.Build.0 = Release|Win32 {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|Win32.ActiveCfg = Release|Win32 {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Release|x64.ActiveCfg = Release|Win32 + {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Test|Mixed Platforms.Build.0 = Test|Win32 {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Test|Win32.ActiveCfg = Test|Win32 {38FAC3FB-A2B7-453F-8A6A-73B97201BB04}.Test|x64.ActiveCfg = Test|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|Win32.ActiveCfg = Debug|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|x64.ActiveCfg = Debug|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|Mixed Platforms.ActiveCfg = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|Mixed Platforms.Build.0 = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|Win32.ActiveCfg = Release|Win32 @@ -246,14 +242,14 @@ Global {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Mixed Platforms.Build.0 = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Win32.ActiveCfg = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|x64.ActiveCfg = Release|Win32 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.ReleaseXP|x64.ActiveCfg = ReleaseXP|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|Mixed Platforms.Build.0 = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|Win32.ActiveCfg = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|x64.ActiveCfg = Test|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|Win32.ActiveCfg = Debug|Win32 - {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|x64.ActiveCfg = Debug|Win32 {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.FullRelease|Mixed Platforms.ActiveCfg = Release|Win32 {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.FullRelease|Mixed Platforms.Build.0 = Release|Win32 {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.FullRelease|Win32.ActiveCfg = Release|Win32 @@ -262,14 +258,14 @@ Global {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|Mixed Platforms.Build.0 = Release|Win32 {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|Win32.ActiveCfg = Release|Win32 {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Release|x64.ActiveCfg = Release|x64 + {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64 {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Test|Mixed Platforms.Build.0 = Test|Win32 {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Test|Win32.ActiveCfg = Test|Win32 {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Test|x64.ActiveCfg = Test|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|Win32.ActiveCfg = Debug|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|x64.ActiveCfg = Debug|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|Mixed Platforms.ActiveCfg = Release|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|Mixed Platforms.Build.0 = Release|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|Win32.ActiveCfg = Release|Win32 @@ -278,14 +274,14 @@ Global {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|Mixed Platforms.Build.0 = Release|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|Win32.ActiveCfg = Release|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|x64.ActiveCfg = Release|x64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|Mixed Platforms.Build.0 = Test|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|Win32.ActiveCfg = Test|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|x64.ActiveCfg = Test|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|Win32.ActiveCfg = Debug|Win32 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|x64.ActiveCfg = Debug|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|Mixed Platforms.ActiveCfg = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|Mixed Platforms.Build.0 = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|Win32.ActiveCfg = Release|Win32 @@ -294,14 +290,14 @@ Global {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|Mixed Platforms.Build.0 = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|Win32.ActiveCfg = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|x64.ActiveCfg = Release|x64 + {98BA115B-829F-4085-9729-ABD0D779A60A}.ReleaseXP|Mixed Platforms.ActiveCfg = ReleaseXP|Win32 + {98BA115B-829F-4085-9729-ABD0D779A60A}.ReleaseXP|Mixed Platforms.Build.0 = ReleaseXP|Win32 + {98BA115B-829F-4085-9729-ABD0D779A60A}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 + {98BA115B-829F-4085-9729-ABD0D779A60A}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64 {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|Mixed Platforms.ActiveCfg = Test|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|Mixed Platforms.Build.0 = Test|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|Win32.ActiveCfg = Test|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|x64.ActiveCfg = Test|x64 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|Win32.ActiveCfg = Debug|x86 - {BE211CE1-3955-4674-A664-5038FC791980}.Debug|x64.ActiveCfg = Debug|x86 {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Mixed Platforms.ActiveCfg = Release|x86 {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Mixed Platforms.Build.0 = Release|x86 {BE211CE1-3955-4674-A664-5038FC791980}.FullRelease|Win32.ActiveCfg = Release|x86 @@ -310,6 +306,9 @@ Global {BE211CE1-3955-4674-A664-5038FC791980}.Release|Mixed Platforms.Build.0 = Release|x86 {BE211CE1-3955-4674-A664-5038FC791980}.Release|Win32.ActiveCfg = Release|x86 {BE211CE1-3955-4674-A664-5038FC791980}.Release|x64.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.ReleaseXP|Mixed Platforms.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.ReleaseXP|Win32.ActiveCfg = Release|x86 + {BE211CE1-3955-4674-A664-5038FC791980}.ReleaseXP|x64.ActiveCfg = Release|x64 {BE211CE1-3955-4674-A664-5038FC791980}.Test|Mixed Platforms.ActiveCfg = Release|x86 {BE211CE1-3955-4674-A664-5038FC791980}.Test|Mixed Platforms.Build.0 = Release|x86 {BE211CE1-3955-4674-A664-5038FC791980}.Test|Win32.ActiveCfg = Release|x86 @@ -318,4 +317,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F24D3C8D-5599-44F1-B1A4-31161B6A1A09} + EndGlobalSection EndGlobal diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj index 90f06822..209a0ecd 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj @@ -17,6 +17,14 @@ FullRelease x64 + + ReleaseXP + Win32 + + + ReleaseXP + x64 + Release Win32 @@ -47,10 +55,17 @@ false Unicode true - v141_xp + v142 false + Application + false + Unicode + v142 + false + + Application false Unicode @@ -61,14 +76,14 @@ Application false Unicode - v141_xp + v142 false Application false Unicode - v141_xp + v142 false @@ -76,28 +91,35 @@ false Unicode true - v141 + v142 false Application false Unicode - v141 + v142 + false + + + Application + false + Unicode + v141_xp false Application false Unicode - v141 + v142 false Application false Unicode - v141 + v142 false @@ -109,6 +131,9 @@ + + + @@ -121,6 +146,9 @@ + + + @@ -139,18 +167,25 @@ true true d:\amiga\ + d:\amiga\ d:\amiga\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ false + false false d:\amiga\ + d:\amiga\ d:\amiga\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false + false false true + true true d:\amiga\ $(Configuration)\ @@ -162,11 +197,14 @@ true winuae64 winuae64 + winuae64 winuae64 winuae64 $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) C:\dev\lib;$(LibraryPath) + C:\dev\lib;$(LibraryPath) C:\dev\lib;$(LibraryPath) C:\dev\lib;$(LibraryPath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) @@ -174,14 +212,17 @@ $(VC_ReferencesPath_x86); C:\dev\lib;$(LibraryPath) true + true true true true $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) C:\dev\lib\x64;$(LibraryPath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) C:\dev\lib\x64;$(LibraryPath) + C:\dev\lib\x64;$(LibraryPath) C:\dev\lib\x64;$(LibraryPath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\ucrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\winrt;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\um;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\shared;$(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.17763.0\km;c:\dev\include;$(IncludePath) C:\dev\lib\x64;$(LibraryPath) @@ -199,6 +240,10 @@ $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x86;$(ExecutablePath) $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); + + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x86;$(ExecutablePath) + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x86;$(ExecutablePath) $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); @@ -210,6 +255,10 @@ $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) NativeMinimumRules.ruleset + + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) + NativeMinimumRules.ruleset + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x86;$(ExecutablePath) $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); @@ -425,6 +474,86 @@ /validate_manifest %(AdditionalOptions) + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/winuae_msvc.tlb + + + Full + AnySuitable + true + Speed + true + false + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;:%(AdditionalIncludeDirectories) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + true + StreamingSIMDExtensions2 + Fast + false + false + + + .\Release/winuae_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + FastCall + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;libpng16.lib;lglcd.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + %(AdditionalManifestDependencies) + %(IgnoreSpecificDefaultLibraries) + d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;ddraw.dll;Iphlpapi.dll;gdiplus.dll;%(DelayLoadDLLs) + true + .\Release/winuae.pdb + Windows + + + + + true + true + true + + + true + false + true + MachineX86 + 5.01 + + + /ignore:4099 %(AdditionalOptions) + + + ../resources/winuae.exe.manifest + $(IntDir)$(TargetName)$(TargetExt).embed.manifest + /validate_manifest %(AdditionalOptions) + + NDEBUG;%(PreprocessorDefinitions) @@ -581,6 +710,82 @@ PerMonitorHighDPIAware + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/winuae_msvc.tlb + + + Full + AnySuitable + true + Speed + true + false + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + true + NotSet + Fast + false + false + NotUsing + $(Platform)\$(Configuration)/winuae_msvc.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + FastCall + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;%(AdditionalDependencies) + NotSet + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + MSVCRT.lib;%(IgnoreSpecificDefaultLibraries);MSVCRT + d3dx9_43.dll;openal32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;Iphlpapi.dll;%(DelayLoadDLLs) + true + $(Platform)\$(Configuration)\winuae.pdb + Windows + + + + + true + true + + + false + true + true + MachineX64 + true + 0x10000000 + /ignore:4099 %(AdditionalOptions) + + + ..\resources\winuae64.exe.manifest + PerMonitorHighDPIAware + + NDEBUG;%(PreprocessorDefinitions) @@ -1106,15 +1311,11 @@ - - - - @@ -1125,7 +1326,6 @@ - @@ -1140,14 +1340,6 @@ - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources - \projects\winuae\src\od-win32\resources @@ -1155,6 +1347,7 @@ true true true + true true Document @@ -1162,6 +1355,7 @@ true true true + true true Document @@ -1169,6 +1363,7 @@ true true true + true true Document @@ -1176,6 +1371,7 @@ true true true + true true Document @@ -1183,6 +1379,7 @@ true true true + true true Document @@ -1190,6 +1387,7 @@ true true true + true true Document @@ -1201,11 +1399,13 @@ true true + true true true true true true + true true @@ -1217,24 +1417,31 @@ ../Shaders/PixelShaderAlpha.h + ../Shaders/PixelShaderAlpha.h + + PS_PostAlpha ../Shaders/PixelShaderAlpha.h PS_PostAlpha + PS_PostAlpha PS_PostAlpha ../Shaders/PixelShaderAlpha.h PS_PostAlpha PS_PostAlpha + PS_PostAlpha PS_PostAlpha Pixel 4.0_level_9_1 Pixel + Pixel 4.0_level_9_1 + 4.0_level_9_1 Pixel 4.0_level_9_1 PS_PostAlpha @@ -1244,8 +1451,11 @@ Pixel 4.0_level_9_1 PS_PostAlpha + PS_PostAlpha Pixel + Pixel 4.0_level_9_1 + 4.0_level_9_1 PS_PostAlpha Pixel 4.0_level_9_1 @@ -1258,9 +1468,13 @@ PS_PostAlpha + PS_PostAlpha ../Shaders/PixelShaderAlpha.h + ../Shaders/PixelShaderAlpha.h + + PS_PostAlpha ../Shaders/PixelShaderAlpha.h @@ -1277,7 +1491,9 @@ Pixel 4.0_level_9_1 Pixel + Pixel 4.0_level_9_1 + 4.0_level_9_1 Pixel 4.0_level_9_1 PS_PostMask @@ -1285,9 +1501,13 @@ PS_PostMask + PS_PostMask ../Shaders/PixelShaderMask.h + ../Shaders/PixelShaderMask.h + + PS_PostMask ../Shaders/PixelShaderMask.h @@ -1301,15 +1521,20 @@ PS_PostMask + PS_PostMask ../Shaders/PixelShaderMask.h + ../Shaders/PixelShaderMask.h + + PS_PostMask ../Shaders/PixelShaderMask.h PS_PostMask PS_PostMask + PS_PostMask PS_PostMask PS_PostMask Pixel @@ -1318,8 +1543,11 @@ Pixel 4.0_level_9_1 PS_PostMask + PS_PostMask Pixel + Pixel 4.0_level_9_1 + 4.0_level_9_1 PS_PostMask Pixel 4.0_level_9_1 @@ -1335,7 +1563,9 @@ Pixel 4.0_level_9_1 Pixel + Pixel 4.0_level_9_1 + 4.0_level_9_1 Pixel 4.0_level_9_1 PS_PostPlain @@ -1343,15 +1573,20 @@ PS_PostPlain + PS_PostPlain ../Shaders/PixelShaderPlain.h + ../Shaders/PixelShaderPlain.h + + PS_PostPlain ../Shaders/PixelShaderPlain.h PS_PostPlain PS_PostPlain + PS_PostPlain PS_PostPlain PS_PostPlain Pixel @@ -1360,8 +1595,11 @@ Pixel 4.0_level_9_1 PS_PostPlain + PS_PostPlain Pixel + Pixel 4.0_level_9_1 + 4.0_level_9_1 PS_PostPlain Pixel 4.0_level_9_1 @@ -1374,9 +1612,13 @@ PS_PostPlain + PS_PostPlain ../Shaders/PixelShaderPlain.h + ../Shaders/PixelShaderPlain.h + + PS_PostPlain ../Shaders/PixelShaderPlain.h @@ -1393,7 +1635,9 @@ Vertex 4.0_level_9_1 Vertex + Vertex 4.0_level_9_1 + 4.0_level_9_1 Vertex 4.0_level_9_1 VertexShader @@ -1401,9 +1645,13 @@ VertexShader + VertexShader ../Shaders/VertexShader.h + ../Shaders/VertexShader.h + + VertexShader ../Shaders/VertexShader.h @@ -1417,15 +1665,20 @@ VertexShader + VertexShader ../Shaders/VertexShader.h + ../Shaders/VertexShader.h + + VertexShader ../Shaders/VertexShader.h TextureVertexShader TextureVertexShader + TextureVertexShader TextureVertexShader TextureVertexShader Vertex @@ -1434,8 +1687,11 @@ Vertex 4.0_level_9_1 TextureVertexShader + TextureVertexShader Vertex + Vertex 4.0_level_9_1 + 4.0_level_9_1 TextureVertexShader Vertex 4.0_level_9_1 @@ -1446,20 +1702,24 @@ true true true + true true false false false + false false true true true + true true false false false + false false diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters index 58ec3976..67979089 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters @@ -954,15 +954,9 @@ win32\Resource Files - - win32\Resource Files - win32\Resource Files - - win32\Resource Files - win32\Resource Files @@ -972,15 +966,9 @@ win32\Resource Files - - win32\Resource Files - win32\Resource Files - - win32\Resource Files - win32\Resource Files @@ -1011,9 +999,6 @@ win32\Resource Files - - win32\Resource Files - win32\Resource Files -- 2.47.3