[manyports]Regenerate patches and modify how the patches are used. (#7484)

* [ccfits]Regenerate patches and modify how the patches are used. * [itpp]Regenerate patches and modify how the patches are used. * [mpg123]Regenerate patches and modify how the patches are used. * [qwt]Regenerate patches and modify how the patches are used. * [sdl1]Remove a patche and modify how the patches are used.
2019-08-02 08:54:45 +08:00 · 2019-08-02 08:54:45 +08:00 · bacbcf3527
--- a/ports/ccfits/CONTROL
+++ b/ports/ccfits/CONTROL
@ -1,5 +1,5 @@
 Source: ccfits
-Version: 2.5-2
+Version: 2.5-3
 Homepage: https://heasarc.gsfc.nasa.gov/fitsio/ccfits
 Description: CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.
 Build-Depends: cfitsio
--- a/ports/ccfits/dll_exports.patch
+++ b/ports/ccfits/dll_exports.patch
@ -1,10 +1,7 @@
-Index: FITS.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- FITS.h	(date 1502267716000)
-+++ FITS.h	(revision )
+diff --git a/FITS.h b/FITS.h
+index e21f3db..3e97c83 100644
+--- a/FITS.h
+++ b/FITS.h
@@ -21,6 +21,8 @@
 #include "HDUCreator.h"
 // FitsError
@ -14,42 +11,33 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 
 namespace CCfits {
   class FITSBase;
-@@ -665,9 +667,8 @@
+@@ -665,7 +667,7 @@ do this either).
 
 
 
 -  class FITS 
-  {
-
-+  class CCFITS_EXPORT FITS
-+  {	
+  class CCFITS_EXPORT FITS 
+   {
+ 
     public:
- 
- 
-Index: HDU.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- HDU.h	(date 1502267716000)
-+++ HDU.h	(revision )
-@@ -568,7 +568,7 @@
+diff --git a/HDU.h b/HDU.h
+index 07f68e7..047e731 100644
+--- a/HDU.h
+++ b/HDU.h
+@@ -568,7 +568,7 @@ and return its value.
 
 
 
 -  class HDU 
-+  class CCFITS_EXPORT HDU
+  class CCFITS_EXPORT HDU 
   {
 
     public:
-Index: Table.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- Table.h	(date 1502267716000)
-+++ Table.h	(revision )
-@@ -268,7 +268,7 @@
+diff --git a/Table.h b/Table.h
+index a0c1afe..9a8a5db 100644
+--- a/Table.h
+++ b/Table.h
+@@ -268,7 +268,7 @@ namespace CCfits {
 
 
 
@ -58,19 +46,16 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
 
     public:
-Index: Column.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- Column.h	(date 1502267716000)
-+++ Column.h	(revision )
-@@ -838,14 +838,14 @@
+diff --git a/Column.h b/Column.h
+index e4496a7..b798947 100644
+--- a/Column.h
+++ b/Column.h
+@@ -838,14 +838,14 @@ namespace CCfits {
 
 
 
 -  class Column 
-+  class CCFITS_EXPORT Column
+  class CCFITS_EXPORT Column 
   {
 
     public:
@ -82,7 +67,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             RangeError (const String& msg, bool silent = true);
-@@ -857,7 +857,7 @@
+@@ -857,7 +857,7 @@ namespace CCfits {
 
 
 
@ -91,7 +76,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             InvalidDataType (const String& str = string(), bool silent = true);
-@@ -869,7 +869,7 @@
+@@ -869,7 +869,7 @@ namespace CCfits {
 
 
 
@ -100,7 +85,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             InvalidRowParameter (const String& diag, bool silent = true);
-@@ -881,7 +881,7 @@
+@@ -881,7 +881,7 @@ namespace CCfits {
 
 
 
@ -109,7 +94,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             WrongColumnType (const String& diag, bool silent = true);
-@@ -893,7 +893,7 @@
+@@ -893,7 +893,7 @@ namespace CCfits {
 
 
 
@ -118,7 +103,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             UnspecifiedLengths (const String& diag, bool silent = true);
-@@ -905,7 +905,7 @@
+@@ -905,7 +905,7 @@ namespace CCfits {
 
 
 
@ -127,7 +112,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             InvalidRowNumber (const String& diag, bool silent = true);
-@@ -917,7 +917,7 @@
+@@ -917,7 +917,7 @@ namespace CCfits {
 
 
 
@ -136,7 +121,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             InsufficientElements (const String& msg, bool silent = true);
-@@ -929,7 +929,7 @@
+@@ -929,7 +929,7 @@ namespace CCfits {
 
 
 
@ -145,7 +130,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             NoNullValue (const String& diag, bool silent = true);
-@@ -941,7 +941,7 @@
+@@ -941,7 +941,7 @@ namespace CCfits {
 
 
 
@ -154,14 +139,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
       {
         public:
             InvalidNumberOfRows (int number, bool silent = true);
-Index: AsciiTable.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- AsciiTable.h	(date 1502267716000)
-+++ AsciiTable.h	(revision )
-@@ -133,7 +133,7 @@
+diff --git a/AsciiTable.h b/AsciiTable.h
+index 620cf41..d03aa44 100644
+--- a/AsciiTable.h
+++ b/AsciiTable.h
+@@ -133,7 +133,7 @@ namespace CCfits {
 
 
 
@ -170,14 +152,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
 
     public:
-Index: CCfits.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- CCfits.h	(date 1502267716000)
-+++ CCfits.h	(revision )
-@@ -23,7 +23,7 @@
+diff --git a/CCfits.h b/CCfits.h
+index d09438a..a62b8a6 100644
+--- a/CCfits.h
+++ b/CCfits.h
+@@ -23,7 +23,7 @@ namespace CCfits {
 #include <sys/types.h>
 #include "longnam.h"
 #include "float.h"
@ -186,7 +165,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 
 namespace CCfits {
   /*! \namespace CCfits
-@@ -32,8 +32,8 @@
+@@ -32,8 +32,8 @@ namespace CCfits {
   static const int BITPIX = -32;
   static const int  NAXIS =   2;
   static const int  MAXDIM = 99;
@ -197,46 +176,37 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 
   extern  char BSCALE[7];
   extern  char BZERO[6];
-Index: FITSBase.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- FITSBase.h	(date 1502267716000)
-+++ FITSBase.h	(revision )
-@@ -30,7 +30,7 @@
+diff --git a/FITSBase.h b/FITSBase.h
+index 996fdae..0c985f9 100644
+--- a/FITSBase.h
+++ b/FITSBase.h
+@@ -30,7 +30,7 @@ namespace CCfits {
 
 
 
 -  class FITSBase 
-+  class CCFITS_EXPORT FITSBase
+  class CCFITS_EXPORT FITSBase 
   {
 
     public:
-Index: Keyword.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- Keyword.h	(date 1502267716000)
-+++ Keyword.h	(revision )
-@@ -195,7 +195,7 @@
+diff --git a/Keyword.h b/Keyword.h
+index 816c119..b6df1f1 100644
+--- a/Keyword.h
+++ b/Keyword.h
+@@ -195,7 +195,7 @@ namespace CCfits {
 
 
 
 -  class Keyword 
-+  class CCFITS_EXPORT Keyword
+  class CCFITS_EXPORT Keyword 
   {
 
     public:
-Index: ExtHDU.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- ExtHDU.h	(date 1502267716000)
-+++ ExtHDU.h	(revision )
-@@ -435,7 +435,7 @@
+diff --git a/ExtHDU.h b/ExtHDU.h
+index d075fa1..e2d7dc6 100644
+--- a/ExtHDU.h
+++ b/ExtHDU.h
+@@ -435,7 +435,7 @@ namespace CCfits {
 
 
 
@ -245,14 +215,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
 
     public:
-Index: PHDU.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- PHDU.h	(date 1502267716000)
-+++ PHDU.h	(revision )
-@@ -264,7 +264,7 @@
+diff --git a/PHDU.h b/PHDU.h
+index fe5f799..d9669b4 100644
+--- a/PHDU.h
+++ b/PHDU.h
+@@ -264,7 +264,7 @@ namespace CCfits {
 
 
 
@ -261,14 +228,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
 
     public:
-Index: BinTable.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- BinTable.h	(date 1502267716000)
-+++ BinTable.h	(revision )
-@@ -127,7 +127,7 @@
+diff --git a/BinTable.h b/BinTable.h
+index 68851e3..906005a 100644
+--- a/BinTable.h
+++ b/BinTable.h
+@@ -127,7 +127,7 @@ namespace CCfits {
 
 
 
@ -277,63 +241,41 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
 
     public:
-Index: Image.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- Image.h	(date 1502267716000)
-+++ Image.h	(revision )
-@@ -32,7 +32,7 @@
- 
- 
-   template <typename T>
-  class Image 
-+  class Image
-   {
- 
-     public:
-Index: ColumnCreator.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- ColumnCreator.h	(date 1502267716000)
-+++ ColumnCreator.h	(revision )
-@@ -28,7 +28,7 @@
+diff --git a/ColumnCreator.h b/ColumnCreator.h
+index 104bd4f..15cd0ea 100644
+--- a/ColumnCreator.h
+++ b/ColumnCreator.h
+@@ -28,7 +28,7 @@ namespace CCfits {
 
 
 
 -  class ColumnCreator 
-+  class CCFITS_EXPORT ColumnCreator
+  class CCFITS_EXPORT ColumnCreator 
   {
 
     public:
-Index: FitsError.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- FitsError.h	(date 1502267716000)
-+++ FitsError.h	(revision )
-@@ -14,6 +14,7 @@
+diff --git a/FitsError.h b/FitsError.h
+index 593723c..52941f6 100644
+--- a/FitsError.h
+++ b/FitsError.h
+@@ -13,6 +13,7 @@
+ //#include <exception>
 //#include <iostream>
 //#include <stl.h>
- #include <string>
 +#include "ccfits_export.h"
+ #include <string>
 using std::string;
 
- 
-@@ -90,7 +91,7 @@
+@@ -90,7 +91,7 @@ namespace CCfits {
 
 
 
 -  class FitsException 
-+  class CCFITS_EXPORT FitsException
+  class CCFITS_EXPORT FitsException 
   {
     public:
         FitsException (const string& msg, bool& silent);
-@@ -109,7 +110,7 @@
+@@ -109,7 +110,7 @@ namespace CCfits {
 
 
 
@ -342,40 +284,34 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
     public:
         FitsError (int errornum, bool silent = true);
-@@ -123,7 +124,7 @@
+@@ -123,7 +124,7 @@ namespace CCfits {
 
 
 
 -  class FitsFatal 
-+  class CCFITS_EXPORT FitsFatal
+  class CCFITS_EXPORT FitsFatal 
   {
     public:
         FitsFatal (const string& diag);
-Index: HDUCreator.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- HDUCreator.h	(date 1502267716000)
-+++ HDUCreator.h	(revision )
-@@ -35,7 +35,7 @@
+diff --git a/HDUCreator.h b/HDUCreator.h
+index 65b82b7..2b5f717 100644
+--- a/HDUCreator.h
+++ b/HDUCreator.h
+@@ -35,7 +35,7 @@ namespace CCfits {
 
 
 
 -  class HDUCreator 
-+  class CCFITS_EXPORT HDUCreator
+  class CCFITS_EXPORT HDUCreator 
   {
 
     public:
-Index: ccfits_export.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- ccfits_export.h	(revision )
-+++ ccfits_export.h	(revision )
-@@ -0,0 +1,42 @@
-+
+diff --git a/ccfits_export.h b/ccfits_export.h
+new file mode 100644
+index 0000000..a2540a6 100644
+--- /dev/null
+++ b/ccfits_export.h
+@@ -0,0 +1,41 @@
 +#ifndef CCFITS_EXPORT_H
 +#define CCFITS_EXPORT_H
 +
@ -417,13 +353,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 +#endif
 +
 +#endif
-Index: FITSUtil.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- FITSUtil.h	(date 1502267716000)
-+++ FITSUtil.h	(revision )
+\ No newline at end of file
+diff --git a/FITSUtil.h b/FITSUtil.h
+index 762d430..e2eee33 100644
+--- a/FITSUtil.h
+++ b/FITSUtil.h
@@ -22,6 +22,7 @@
 #include <string>
 // FitsError
@ -432,7 +366,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 #include <typeinfo>
 
 
-@@ -287,21 +288,21 @@
+@@ -287,21 +288,21 @@ object.
     template <typename T>
     void swap(std::vector<T>& left, std::vector<T>& right);
 
@ -459,7 +393,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
   {
           bool operator()(const string& left, const string& right) const;
   };
-@@ -323,7 +324,7 @@
+@@ -323,7 +324,7 @@ object.
 
   char** CharArray(const std::vector<string>& inArray);
 
@ -468,7 +402,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
 
 
   template <typename S, typename T> 
-@@ -633,7 +634,7 @@
+@@ -633,7 +634,7 @@ object.
 
 
 
@ -477,19 +411,78 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
     {
       public:
           UnrecognizedType (string diag, bool silent = true);
-Index: KeywordCreator.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
--- KeywordCreator.h	(date 1502267716000)
-+++ KeywordCreator.h	(revision )
-@@ -24,7 +24,7 @@
+diff --git a/KeywordCreator.h b/KeywordCreator.h
+index d878a26..b2c0c70 100644
+--- a/KeywordCreator.h
+++ b/KeywordCreator.h
+@@ -24,7 +24,7 @@ namespace CCfits {
 
 
 
 -  class KeywordCreator 
-+  class CCFITS_EXPORT KeywordCreator
+  class CCFITS_EXPORT KeywordCreator 
   {
 
     public:
+diff --git a/CCfits b/CCfits
+index e9848c9..f30c9ad 100644
+--- a/CCfits
+++ b/CCfits
+@@ -2,20 +2,20 @@
+ #ifndef CCFITS
+ #define CCFITS  20031208
+ 
+-#include <CCfits/CCfits.h>
+#include <CCfits.h>
+ 
+-#include <CCfits/FITS.h>
+-#include <CCfits/BinTable.h>
+-#include <CCfits/AsciiTable.h>
+-#include <CCfits/ColumnVectorData.h>
+-#include <CCfits/ColumnData.h>
+-#include <CCfits/ColumnT.h>
+-#include <CCfits/ExtHDUT.h>
+-#include <CCfits/KeywordT.h>
+-#include <CCfits/KeyData.h>
+-#include <CCfits/FitsError.h>
+-#include <CCfits/FITSUtilT.h>
+-#include <CCfits/PHDUT.h>
+#include <FITS.h>
+#include <BinTable.h>
+#include <AsciiTable.h>
+#include <ColumnVectorData.h>
+#include <ColumnData.h>
+#include <ColumnT.h>
+#include <ExtHDUT.h>
+#include <KeywordT.h>
+#include <KeyData.h>
+#include <FitsError.h>
+#include <FITSUtilT.h>
+#include <PHDUT.h>
+ 
+ 
+ #endif
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b958fc7..0b1fb4e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -30,6 +30,11 @@ IF (BUILD_SHARED_LIBS)
+   SET (LIB_TYPE SHARED)
+ ENDIF (BUILD_SHARED_LIBS)
+ 
+
+IF (NOT BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DCCFITS_STATIC_DEFINE)
+ENDIF()
+
+ FILE(GLOB H_FILES "*.h")
+ SET(H_FILES ${H_FILES} CCfits)
+ 
+@@ -55,6 +60,7 @@ SET(SRC_FILES
+ )
+ 
+ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${H_FILES} ${SRC_FILES})
+
+ TARGET_LINK_LIBRARIES(${LIB_NAME} ${CFITSIO_LIBRARY}
+ )
+ 
--- a/ports/ccfits/portfile.cmake
+++ b/ports/ccfits/portfile.cmake
@ -9,14 +9,11 @@ vcpkg_download_distfile(ARCHIVE
    FILENAME "CCfits-2.5.tar.gz"
    SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_apply_patches(
-        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CCfits
-        PATCHES "${CMAKE_CURRENT_LIST_DIR}/dll_exports.patch"
-    )
-endif()
+vcpkg_extract_source_archive_ex(
+    ARCHIVE ${ARCHIVE}
+    OUT_SOURCE_PATH SOURCE_PATH
+    PATCHES dll_exports.patch
+)

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
--- a/ports/itpp/CONTROL
+++ b/ports/itpp/CONTROL
@ -1,3 +1,3 @@
 Source: itpp
-Version: 4.3.1
+Version: 4.3.1-1
 Description: IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.
--- a/ports/itpp/fix-linux.patch
+++ b/ports/itpp/fix-linux.patch
@ -1,13 +1,17 @@
 diff --git a/itpp/base/random_dsfmt.h b/itpp/base/random_dsfmt.h
-index ccbf182..a3d5472 100644
+index ccbf182..de819fb 100644
 --- a/itpp/base/random_dsfmt.h
 +++ b/itpp/base/random_dsfmt.h
-@@ -299,7 +299,7 @@ private:
+@@ -299,7 +299,12 @@ private:
    */
   static void do_recursion(typename Context::w128_t *r, typename Context::w128_t *a, typename Context::w128_t *b, typename Context::w128_t *lung) {
 #if defined(__SSE2__)
-    const unsigned int SSE2_SHUFF = 0x1bU;
+
+#ifdef __linux__
 +#define SSE2_SHUFF 0x1bU
+#else
+     const unsigned int SSE2_SHUFF = 0x1bU;
+#endif
 
     __m128i x = a->si;
     __m128i z = _mm_slli_epi64(x, SL1);
--- a/ports/itpp/fix-uwp.patch
+++ b/ports/itpp/fix-uwp.patch
@ -1,12 +1,15 @@
 diff --git a/itpp/base/timing.cpp b/itpp/base/timing.cpp
-index 58178e4..47d662e 100644
+index 58178e4..6b173d0 100644
 --- a/itpp/base/timing.cpp
 +++ b/itpp/base/timing.cpp
-@@ -51,6 +51,7 @@
- 
+@@ -52,6 +52,10 @@
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include <windows.h>
-+#include <Winsock2.h>
 
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+#include <Winsock2.h>
+#endif
+
 int gettimeofday(struct timeval* p, void*)
 {
+   union {
--- a/ports/itpp/portfile.cmake
+++ b/ports/itpp/portfile.cmake
@ -13,20 +13,10 @@ vcpkg_extract_source_archive_ex(
    REF ${ITPP_VERSION}
    PATCHES 
       msvc2013.patch
+       fix-uwp.patch
+       fix-linux.patch
 )

-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES fix-uwp.patch
-    )
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES fix-linux.patch
-    )
-endif()
-
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
--- a/ports/mpg123/CONTROL
+++ b/ports/mpg123/CONTROL
@ -1,4 +1,4 @@
 Source: mpg123
-Version: 1.25.8-5
+Version: 1.25.8-6
 Homepage: https://sourceforge.net/projects/mpg123/
 Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).
--- a/ports/mpg123/portfile.cmake
+++ b/ports/mpg123/portfile.cmake
@ -2,7 +2,6 @@ include(vcpkg_common_functions)

 set(MPG123_VERSION 1.25.8)
 set(MPG123_HASH f226317dddb07841a13753603fa13c0a867605a5a051626cb30d45cfba266d3d4296f5b8254f65b403bb5eef6addce1784ae8829b671a746854785cda1bad203)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpg123-${MPG123_VERSION})

 #architecture detection
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
@ -23,19 +22,20 @@ vcpkg_download_distfile(ARCHIVE
    FILENAME "mpg123-${MPG123_VERSION}.tar.bz2"
    SHA512 ${MPG123_HASH}
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    ARCHIVE ${ARCHIVE}
+    OUT_SOURCE_PATH SOURCE_PATH
+    PATCHES
+        0001-fix-crt-linking.patch
+        0002-fix-x86-build.patch
+)

 vcpkg_find_acquire_program(YASM)
 get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
 set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")

-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES
-            "${CURRENT_PORT_DIR}/0001-fix-crt-linking.patch"
-            "${CURRENT_PORT_DIR}/0002-fix-x86-build.patch")
-
+if(VCPKG_TARGET_IS_WINDOWS)
    vcpkg_build_msbuild(
        PROJECT_PATH ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
        RELEASE_CONFIGURATION Release_x86${MPG123_CONFIGURATION_SUFFIX}
--- a/ports/qwt/CONTROL
+++ b/ports/qwt/CONTROL
@ -1,5 +1,5 @@
 Source: qwt
-Version: 6.1.3-6
+Version: 6.1.3-7
 Homepage: https://sourceforge.net/projects/qwt
 Description: Qt widgets library for technical applications
 Build-Depends: qt5-base, qt5-svg, qt5-tools
--- a/ports/qwt/build-static-lib.patch
+++ b/ports/qwt/build-static-lib.patch
@ -1,13 +0,0 @@
-diff --git a/qwtconfig.pri b/qwtconfig.pri
-index 2dc3715..756231a 100644
--- a/qwtconfig.pri
-+++ b/qwtconfig.pri
-@@ -72,7 +72,7 @@ QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
- # it will be a static library.
- ######################################################################
- 
-QWT_CONFIG           += QwtDll
-+# QWT_CONFIG           += QwtDll
- 
- ######################################################################
- # QwtPlot enables all classes, that are needed to use the QwtPlot 
--- a/ports/qwt/fix-dynamic-static.patch
+++ b/ports/qwt/fix-dynamic-static.patch
@ -1,13 +1,15 @@
 diff --git a/qwtconfig.pri b/qwtconfig.pri
-index 756231a..2dc3715 100644
+index 1fe6055..441c69b 100644
 --- a/qwtconfig.pri
 +++ b/qwtconfig.pri
-@@ -72,7 +72,7 @@ QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
+@@ -72,7 +72,10 @@ QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
 # it will be a static library.
 ######################################################################
 
-# QWT_CONFIG           += QwtDll
-+QWT_CONFIG           += QwtDll
+CONFIG(dynamic, dynamic|static) {
+
+ QWT_CONFIG           += QwtDll
+}
 
 ######################################################################
 # QwtPlot enables all classes, that are needed to use the QwtPlot 
--- a/ports/qwt/portfile.cmake
+++ b/ports/qwt/portfile.cmake
@ -1,30 +1,25 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/qwt-6.1.3)
+
 vcpkg_download_distfile(ARCHIVE
    URLS "https://sourceforge.net/projects/qwt/files/qwt/6.1.3/qwt-6.1.3.zip"
    FILENAME "qwt-6.1.3.zip"
    SHA512 8f249e23d50f71d14fca37776ea40d8d6931db14d9602e03a343bfb7a9bf55502202103135b77f583c3890a7924220e8a142a01c448dbde311860d89a3b10fc8
 )
-vcpkg_extract_source_archive(${ARCHIVE})

-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES "${CMAKE_CURRENT_LIST_DIR}/build-shared-lib.patch"
-        QUIET
-    )
-else()
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES "${CMAKE_CURRENT_LIST_DIR}/build-static-lib.patch"
-        QUIET
-    )
-endif()
+vcpkg_extract_source_archive_ex(
+    ARCHIVE ${ARCHIVE}
+    OUT_SOURCE_PATH SOURCE_PATH
+    PATCHES fix-dynamic-static.patch
+)

 set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
 set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")

-vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH})
+vcpkg_configure_qmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        CONFIG+=${VCPKG_LIBRARY_LINKAGE}
+)

 vcpkg_build_qmake(
    RELEASE_TARGETS sub-src-release_ordered
--- a/ports/sdl1/CONTROL
+++ b/ports/sdl1/CONTROL
@ -1,3 +1,3 @@
 Source: sdl1
-Version: 1.2.15-5
+Version: 1.2.15-6
 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.
--- a/ports/sdl1/SDL_dynamic.vcxproj
+++ b/ports/sdl1/SDL_dynamic.vcxproj
--- a/ports/sdl1/SDL_static.vcxproj
+++ b/ports/sdl1/SDL_static.vcxproj
@ -0,0 +1,354 @@
+<?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;%(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;%(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;%(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;%(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>
--- a/ports/sdl1/SDLmain_dynamic.vcxproj
+++ b/ports/sdl1/SDLmain_dynamic.vcxproj
--- a/ports/sdl1/SDLmain_static.vcxproj
+++ b/ports/sdl1/SDLmain_static.vcxproj
@ -0,0 +1,215 @@
+<?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>
--- a/ports/sdl1/portfile.cmake
+++ b/ports/sdl1/portfile.cmake
@ -9,18 +9,16 @@ vcpkg_from_github(
    PATCHES export-symbols-only-in-shared-build.patch
 )

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln DESTINATION ${SOURCE_PATH}/VisualC/ )
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDL )
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDLmain.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDLmain )
-
 configure_file(${SOURCE_PATH}/include/SDL_config.h.default ${SOURCE_PATH}/include/SDL_config.h COPYONLY)

+file(COPY ${CMAKE_CURRENT_LIST_DIR}/SDL1_2017.sln DESTINATION ${SOURCE_PATH}/VisualC/ )
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/static-build.patch
-    )
+    file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/SDL_static.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDL RENAME SDL.vcxproj)
+    file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/SDLmain_static.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDLmain RENAME SDLmain.vcxproj)
+else()
+    file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/SDL_dynamic.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDL RENAME SDL.vcxproj)
+    file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/SDLmain_dynamic.vcxproj DESTINATION ${SOURCE_PATH}/VisualC/SDLmain RENAME SDLmain.vcxproj)
 endif()

 # This text file gets copied as a library, and included as one in the package 
--- a/ports/sdl1/static-build.patch
+++ b/ports/sdl1/static-build.patch
@ -1,74 +0,0 @@
--- a/VisualC/SDL/SDL.vcxproj	Sun Mar 31 11:28:40 2019
-+++ b/VisualC/SDL/SDL.vcxproj	Sun Mar 31 19:00:00 2019
-@@ -26,3 +26,3 @@
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-     <PlatformToolset>v141</PlatformToolset>
-@@ -31,3 +31,3 @@
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-     <PlatformToolset>v141</PlatformToolset>
-@@ -36,3 +36,3 @@
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-     <PlatformToolset>v141</PlatformToolset>
-@@ -41,3 +41,3 @@
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-+    <ConfigurationType>StaticLibrary</ConfigurationType>
-     <PlatformToolset>v141</PlatformToolset>
-@@ -100,3 +100,3 @@
-       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-       <BufferSecurityCheck>false</BufferSecurityCheck>
-@@ -137,3 +137,3 @@
-       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-       <BufferSecurityCheck>false</BufferSecurityCheck>
-@@ -176,3 +176,3 @@
-       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <BufferSecurityCheck>false</BufferSecurityCheck>
-@@ -213,3 +213,3 @@
-       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <BufferSecurityCheck>false</BufferSecurityCheck>
--- a/VisualC/SDLmain/SDLmain.vcxproj	Sun Mar 31 11:28:40 2019
-+++ b/VisualC/SDLmain/SDLmain.vcxproj	Sun Mar 31 19:00:00 2019
-@@ -123,3 +123,3 @@
-       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-@@ -140,3 +140,3 @@
-       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-@@ -154,3 +154,3 @@
-       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-@@ -171,3 +171,3 @@
-       <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-@@ -184,3 +184,3 @@
-       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-       <PrecompiledHeader />
-@@ -200,3 +200,3 @@
-       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-       <PrecompiledHeader />