[sdl1] x64-windows-static-md fixes (#15126)

6 files changed, 35 insertions, 595 deletions

diff --git a/ports/sdl1/CONTROL b/ports/sdl1/CONTROL
index 87bb7b2af..257955650 100644
--- a/ports/sdl1/CONTROL
+++ b/ports/sdl1/CONTROL
@@ -1,5 +1,5 @@
 Source: sdl1
 Version: 1.2.15
-Port-Version: 12
+Port-Version: 13
 Homepage: https://www.libsdl.org
 Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.
diff --git a/ports/sdl1/SDL_dynamic.vcxproj b/ports/sdl1/SDL.vcxproj.in
index f6c3873f2..f4b29a2c8 100644
--- a/ports/sdl1/SDL_dynamic.vcxproj
+++ b/ports/sdl1/SDL.vcxproj.in
@@ -32,32 +32,32 @@
   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <ConfigurationType>@LIB_TYPE@</ConfigurationType>

     <PlatformToolset>v141</PlatformToolset>

     <UseOfMfc>false</UseOfMfc>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <ConfigurationType>@LIB_TYPE@</ConfigurationType>

     <PlatformToolset>v141</PlatformToolset>

     <UseOfMfc>false</UseOfMfc>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <ConfigurationType>@LIB_TYPE@</ConfigurationType>

     <PlatformToolset>v141</PlatformToolset>

     <UseOfMfc>false</UseOfMfc>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <ConfigurationType>@LIB_TYPE@</ConfigurationType>

     <PlatformToolset>v141</PlatformToolset>

     <UseOfMfc>false</UseOfMfc>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <ConfigurationType>@LIB_TYPE@</ConfigurationType>

     <PlatformToolset>v141</PlatformToolset>

     <UseOfMfc>false</UseOfMfc>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <ConfigurationType>@LIB_TYPE@</ConfigurationType>

     <PlatformToolset>v141</PlatformToolset>

     <UseOfMfc>false</UseOfMfc>

   </PropertyGroup>

@@ -134,7 +134,7 @@
       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <PrecompiledHeader />

       <PrecompiledHeaderOutputFile>.\Debug/SDL.pch</PrecompiledHeaderOutputFile>

@@ -171,7 +171,7 @@
       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <PrecompiledHeader />

       <PrecompiledHeaderOutputFile>.\Debug/SDL.pch</PrecompiledHeaderOutputFile>

@@ -207,7 +207,7 @@
       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -246,7 +246,7 @@
       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader />

@@ -283,7 +283,7 @@
       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader />

@@ -319,7 +319,7 @@
       <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>

diff --git a/ports/sdl1/SDL_static.vcxproj b/ports/sdl1/SDL_static.vcxproj
deleted file mode 100644
index dfe46bba3..000000000
--- a/ports/sdl1/SDL_static.vcxproj
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}</ProjectGuid>

-    <RootNamespace>SDL</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <PlatformToolset>v141</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <PlatformToolset>v141</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <PlatformToolset>v141</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <PlatformToolset>v141</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>15.0.27924.0</_ProjectFileVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>

-    <IntDir>$(Configuration)\</IntDir>

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

-    <IntDir>$(Platform)\$(Configuration)\</IntDir>

-    <LinkIncremental>true</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>

-    <IntDir>$(Configuration)\</IntDir>

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>

-    <IntDir>$(Platform)\$(Configuration)\</IntDir>

-    <LinkIncremental>false</LinkIncremental>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Midl>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>.\Debug/SDL.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader />

-      <PrecompiledHeaderOutputFile>.\Debug/SDL.pch</PrecompiledHeaderOutputFile>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x0409</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>.\Debug/SDL.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>.\Debug/SDL.pdb</ProgramDatabaseFile>

-      <SubSystem>Windows</SubSystem>

-      <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>X64</TargetEnvironment>

-      <TypeLibraryName>.\Debug/SDL.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <PrecompiledHeader />

-      <PrecompiledHeaderOutputFile>.\Debug/SDL.pch</PrecompiledHeaderOutputFile>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x0409</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>.\Debug/SDL.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>.\Debug/SDL.pdb</ProgramDatabaseFile>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-      <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>Win32</TargetEnvironment>

-      <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader />

-      <PrecompiledHeaderOutputFile>.\Release/SDL.pch</PrecompiledHeaderOutputFile>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x0409</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

-      <AdditionalDependencies>winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>.\Release/SDL.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ProgramDatabaseFile>.\Release/SDL.pdb</ProgramDatabaseFile>

-      <SubSystem>Windows</SubSystem>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MkTypLibCompatible>true</MkTypLibCompatible>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <TargetEnvironment>X64</TargetEnvironment>

-      <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

-      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader />

-      <PrecompiledHeaderOutputFile>.\Release/SDL.pch</PrecompiledHeaderOutputFile>

-      <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x0409</Culture>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>winmm.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <OutputFile>.\Release/SDL.dll</OutputFile>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

-      <ProgramDatabaseFile>.\Release/SDL.pdb</ProgramDatabaseFile>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\src\audio\disk\SDL_diskaudio.c" />

-    <ClCompile Include="..\..\src\audio\dummy\SDL_dummyaudio.c" />

-    <ClCompile Include="..\..\src\audio\SDL_audio.c" />

-    <ClCompile Include="..\..\src\audio\SDL_audiocvt.c" />

-    <ClCompile Include="..\..\src\audio\SDL_mixer.c" />

-    <ClCompile Include="..\..\src\audio\SDL_mixer_MMX_VC.c" />

-    <ClCompile Include="..\..\src\audio\SDL_wave.c" />

-    <ClCompile Include="..\..\src\audio\windib\SDL_dibaudio.c" />

-    <ClCompile Include="..\..\src\audio\windx5\SDL_dx5audio.c" />

-    <ClCompile Include="..\..\src\cdrom\SDL_cdrom.c" />

-    <ClCompile Include="..\..\src\cdrom\win32\SDL_syscdrom.c" />

-    <ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c" />

-    <ClCompile Include="..\..\src\events\SDL_active.c" />

-    <ClCompile Include="..\..\src\events\SDL_events.c" />

-    <ClCompile Include="..\..\src\events\SDL_expose.c" />

-    <ClCompile Include="..\..\src\events\SDL_keyboard.c" />

-    <ClCompile Include="..\..\src\events\SDL_mouse.c" />

-    <ClCompile Include="..\..\src\events\SDL_quit.c" />

-    <ClCompile Include="..\..\src\events\SDL_resize.c" />

-    <ClCompile Include="..\..\src\file\SDL_rwops.c" />

-    <ClCompile Include="..\..\src\joystick\SDL_joystick.c" />

-    <ClCompile Include="..\..\src\joystick\win32\SDL_mmjoystick.c" />

-    <ClCompile Include="..\..\src\loadso\win32\SDL_sysloadso.c" />

-    <ClCompile Include="..\..\src\SDL.c" />

-    <ClCompile Include="..\..\src\SDL_error.c" />

-    <ClCompile Include="..\..\src\SDL_fatal.c" />

-    <ClCompile Include="..\..\src\stdlib\SDL_getenv.c" />

-    <ClCompile Include="..\..\src\stdlib\SDL_iconv.c" />

-    <ClCompile Include="..\..\src\stdlib\SDL_malloc.c" />

-    <ClCompile Include="..\..\src\stdlib\SDL_qsort.c" />

-    <ClCompile Include="..\..\src\stdlib\SDL_stdlib.c" />

-    <ClCompile Include="..\..\src\stdlib\SDL_string.c" />

-    <ClCompile Include="..\..\src\thread\generic\SDL_syscond.c" />

-    <ClCompile Include="..\..\src\thread\SDL_thread.c" />

-    <ClCompile Include="..\..\src\thread\win32\SDL_sysmutex.c" />

-    <ClCompile Include="..\..\src\thread\win32\SDL_syssem.c" />

-    <ClCompile Include="..\..\src\thread\win32\SDL_systhread.c" />

-    <ClCompile Include="..\..\src\timer\SDL_timer.c" />

-    <ClCompile Include="..\..\src\timer\win32\SDL_systimer.c" />

-    <ClCompile Include="..\..\src\video\dummy\SDL_nullevents.c" />

-    <ClCompile Include="..\..\src\video\dummy\SDL_nullmouse.c" />

-    <ClCompile Include="..\..\src\video\dummy\SDL_nullvideo.c" />

-    <ClCompile Include="..\..\src\video\SDL_blit.c" />

-    <ClCompile Include="..\..\src\video\SDL_blit_0.c" />

-    <ClCompile Include="..\..\src\video\SDL_blit_1.c" />

-    <ClCompile Include="..\..\src\video\SDL_blit_A.c" />

-    <ClCompile Include="..\..\src\video\SDL_blit_N.c" />

-    <ClCompile Include="..\..\src\video\SDL_bmp.c" />

-    <ClCompile Include="..\..\src\video\SDL_cursor.c" />

-    <ClCompile Include="..\..\src\video\SDL_gamma.c" />

-    <ClCompile Include="..\..\src\video\SDL_pixels.c" />

-    <ClCompile Include="..\..\src\video\SDL_RLEaccel.c" />

-    <ClCompile Include="..\..\src\video\SDL_stretch.c" />

-    <ClCompile Include="..\..\src\video\SDL_surface.c" />

-    <ClCompile Include="..\..\src\video\SDL_video.c" />

-    <ClCompile Include="..\..\src\video\SDL_yuv.c" />

-    <ClCompile Include="..\..\src\video\SDL_yuv_sw.c" />

-    <ClCompile Include="..\..\src\video\wincommon\SDL_sysevents.c" />

-    <ClCompile Include="..\..\src\video\wincommon\SDL_sysmouse.c" />

-    <ClCompile Include="..\..\src\video\wincommon\SDL_syswm.c" />

-    <ClCompile Include="..\..\src\video\wincommon\SDL_wingl.c" />

-    <ClCompile Include="..\..\src\video\windib\SDL_dibevents.c" />

-    <ClCompile Include="..\..\src\video\windib\SDL_dibvideo.c" />

-    <ClCompile Include="..\..\src\video\Windx5\SDL_dx5events.c" />

-    <ClCompile Include="..\..\src\video\Windx5\SDL_dx5video.c" />

-    <ClCompile Include="..\..\src\video\windx5\SDL_dx5yuv.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />

-    <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />

-    <ClInclude Include="..\..\src\audio\SDL_audiomem.h" />

-    <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />

-    <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />

-    <ClInclude Include="..\..\src\audio\SDL_wave.h" />

-    <ClInclude Include="..\..\src\audio\windib\SDL_dibaudio.h" />

-    <ClInclude Include="..\..\src\audio\windx5\SDL_dx5audio.h" />

-    <ClInclude Include="..\..\src\cdrom\SDL_syscdrom.h" />

-    <ClInclude Include="..\..\src\events\SDL_events_c.h" />

-    <ClInclude Include="..\..\src\events\SDL_sysevents.h" />

-    <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />

-    <ClInclude Include="..\..\src\joystick\SDL_sysjoystick.h" />

-    <ClInclude Include="..\..\src\SDL_error_c.h" />

-    <ClInclude Include="..\..\src\SDL_fatal.h" />

-    <ClInclude Include="..\..\src\thread\SDL_systhread.h" />

-    <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />

-    <ClInclude Include="..\..\src\thread\win32\SDL_systhread_c.h" />

-    <ClInclude Include="..\..\src\timer\SDL_systimer.h" />

-    <ClInclude Include="..\..\src\timer\SDL_timer_c.h" />

-    <ClInclude Include="..\..\src\video\dummy\SDL_nullevents_c.h" />

-    <ClInclude Include="..\..\src\video\dummy\SDL_nullmouse_c.h" />

-    <ClInclude Include="..\..\src\video\dummy\SDL_nullvideo.h" />

-    <ClInclude Include="..\..\src\video\SDL_blit.h" />

-    <ClInclude Include="..\..\src\video\SDL_blit_A.h" />

-    <ClInclude Include="..\..\src\video\SDL_cursor_c.h" />

-    <ClInclude Include="..\..\src\video\SDL_leaks.h" />

-    <ClInclude Include="..\..\src\video\SDL_pixels_c.h" />

-    <ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h" />

-    <ClInclude Include="..\..\src\video\SDL_stretch_c.h" />

-    <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />

-    <ClInclude Include="..\..\src\video\SDL_yuvfuncs.h" />

-    <ClInclude Include="..\..\src\video\SDL_yuv_sw_c.h" />

-    <ClInclude Include="..\..\src\video\wincommon\SDL_lowvideo.h" />

-    <ClInclude Include="..\..\src\video\wincommon\SDL_sysmouse_c.h" />

-    <ClInclude Include="..\..\src\video\wincommon\SDL_syswm_c.h" />

-    <ClInclude Include="..\..\src\video\wincommon\SDL_wingl_c.h" />

-    <ClInclude Include="..\..\src\video\wincommon\Wmmsg.h" />

-    <ClInclude Include="..\..\src\video\windib\SDL_dibevents_c.h" />

-    <ClInclude Include="..\..\src\video\windib\SDL_dibvideo.h" />

-    <ClInclude Include="..\..\src\video\windib\SDL_vkeys.h" />

-    <ClInclude Include="..\..\src\video\Windx5\SDL_dx5events_c.h" />

-    <ClInclude Include="..\..\src\video\Windx5\SDL_dx5video.h" />

-    <ClInclude Include="..\..\src\video\windx5\SDL_dx5yuv_c.h" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/ports/sdl1/SDLmain_dynamic.vcxproj b/ports/sdl1/SDLmain.vcxproj.in
index dd4c89a67..249b17440 100644
--- a/ports/sdl1/SDLmain_dynamic.vcxproj
+++ b/ports/sdl1/SDLmain.vcxproj.in
@@ -172,7 +172,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader />

       <PrecompiledHeaderOutputFile>.\Release/SDLmain.pch</PrecompiledHeaderOutputFile>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader />

       <PrecompiledHeaderOutputFile>.\Release/SDLmain.pch</PrecompiledHeaderOutputFile>

@@ -204,7 +204,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -219,7 +219,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader />

       <PrecompiledHeaderOutputFile>.\Release_NOSTDIO/SDLmain.pch</PrecompiledHeaderOutputFile>

@@ -236,7 +236,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader />

       <PrecompiledHeaderOutputFile>.\Release_NOSTDIO/SDLmain.pch</PrecompiledHeaderOutputFile>

@@ -251,7 +251,7 @@
       <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_REL@</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -265,7 +265,7 @@
       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>

       <PrecompiledHeader />

       <PrecompiledHeaderOutputFile>.\Debug/SDLmain.pch</PrecompiledHeaderOutputFile>

       <WarningLevel>Level3</WarningLevel>

@@ -281,7 +281,7 @@
       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>

       <PrecompiledHeader />

       <PrecompiledHeaderOutputFile>.\Debug/SDLmain.pch</PrecompiledHeaderOutputFile>

       <WarningLevel>Level3</WarningLevel>

@@ -295,7 +295,7 @@
       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>@CRT_TYPE_DBG@</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <PrecompiledHeaderOutputFile>.\Debug/SDLmain.pch</PrecompiledHeaderOutputFile>

diff --git a/ports/sdl1/SDLmain_static.vcxproj b/ports/sdl1/SDLmain_static.vcxproj
deleted file mode 100644
index 3f3b6ca01..000000000
--- a/ports/sdl1/SDLmain_static.vcxproj
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release_NoSTDIO|Win32">

-      <Configuration>Release_NoSTDIO</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release_NoSTDIO|x64">

-      <Configuration>Release_NoSTDIO</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}</ProjectGuid>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <PlatformToolset>v141</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoSTDIO|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <PlatformToolset>v141</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <PlatformToolset>v141</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <PlatformToolset>v141</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoSTDIO|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <PlatformToolset>v141</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>StaticLibrary</ConfigurationType>

-    <PlatformToolset>v141</PlatformToolset>

-    <UseOfMfc>false</UseOfMfc>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoSTDIO|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoSTDIO|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>15.0.27924.0</_ProjectFileVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <OutDir>.\Release\</OutDir>

-    <IntDir>.\Release\</IntDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <OutDir>$(Platform)\$(Configuration)\</OutDir>

-    <IntDir>$(Platform)\$(Configuration)\</IntDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoSTDIO|Win32'">

-    <OutDir>.\Release_NOSTDIO\</OutDir>

-    <IntDir>.\Release_NOSTDIO\</IntDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoSTDIO|x64'">

-    <OutDir>$(Platform)\$(Configuration)\</OutDir>

-    <IntDir>$(Platform)\$(Configuration)\</IntDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <OutDir>.\Debug\</OutDir>

-    <IntDir>.\Debug\</IntDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <OutDir>$(Platform)\$(Configuration)\</OutDir>

-    <IntDir>$(Platform)\$(Configuration)\</IntDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader />

-      <PrecompiledHeaderOutputFile>.\Release/SDLmain.pch</PrecompiledHeaderOutputFile>

-      <WarningLevel>Level3</WarningLevel>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader />

-      <PrecompiledHeaderOutputFile>.\Release/SDLmain.pch</PrecompiledHeaderOutputFile>

-      <WarningLevel>Level3</WarningLevel>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoSTDIO|Win32'">

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader />

-      <PrecompiledHeaderOutputFile>.\Release_NOSTDIO/SDLmain.pch</PrecompiledHeaderOutputFile>

-      <WarningLevel>Level3</WarningLevel>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_NoSTDIO|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader />

-      <PrecompiledHeaderOutputFile>.\Release_NOSTDIO/SDLmain.pch</PrecompiledHeaderOutputFile>

-      <WarningLevel>Level3</WarningLevel>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader />

-      <PrecompiledHeaderOutputFile>.\Debug/SDLmain.pch</PrecompiledHeaderOutputFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>OldStyle</DebugInformationFormat>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Midl>

-      <TargetEnvironment>X64</TargetEnvironment>

-    </Midl>

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader />

-      <PrecompiledHeaderOutputFile>.\Debug/SDLmain.pch</PrecompiledHeaderOutputFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>OldStyle</DebugInformationFormat>

-      <CompileAs>Default</CompileAs>

-    </ClCompile>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\Src\Main\Win32\SDL_win32_main.c" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake
index 6dd7da687..47f1b0730 100644
--- a/ports/sdl1/portfile.cmake
+++ b/ports/sdl1/portfile.cmake
@@ -16,13 +16,22 @@ if (VCPKG_TARGET_IS_WINDOWS)
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln DESTINATION ${SOURCE_PATH}/VisualC/ )
     
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        configure_file(${CMAKE_CURRENT_LIST_DIR}/SDL_static.vcxproj  ${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj COPYONLY)
-        configure_file(${CMAKE_CURRENT_LIST_DIR}/SDLmain_static.vcxproj ${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj COPYONLY)
+        set(LIB_TYPE StaticLibrary)

     else()
-        configure_file(${CMAKE_CURRENT_LIST_DIR}/SDL_dynamic.vcxproj ${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj COPYONLY)
-        configure_file(${CMAKE_CURRENT_LIST_DIR}/SDLmain_dynamic.vcxproj ${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj COPYONLY)
+        set(LIB_TYPE DynamicLibrary)
     endif()
     
+    if (VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+        set(CRT_TYPE_DBG MultiThreadedDebugDLL)
+        set(CRT_TYPE_REL MultiThreadedDLL)
+    else()
+        set(CRT_TYPE_DBG MultiThreadedDebug)
+        set(CRT_TYPE_REL MultiThreaded)
+    endif()
+    
+    configure_file(${CURRENT_PORT_DIR}/SDL.vcxproj.in ${SOURCE_PATH}/VisualC/SDL/SDL.vcxproj @ONLY)
+    configure_file(${CURRENT_PORT_DIR}/SDLmain.vcxproj.in ${SOURCE_PATH}/VisualC/SDLmain/SDLmain.vcxproj @ONLY)
+    
     # This text file gets copied as a library, and included as one in the package 
     file(REMOVE_RECURSE ${SOURCE_PATH}/src/hermes/COPYING.LIB)