From bacbcf3527390ae7d20cd9660d82a180f2c8e065 Mon Sep 17 00:00:00 2001 From: JackBoosY <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 2 Aug 2019 08:54:45 +0800 Subject: [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. --- ports/ccfits/CONTROL | 2 +- ports/ccfits/dll_exports.patch | 361 ++++++++++++++++++------------------- ports/ccfits/portfile.cmake | 13 +- ports/itpp/CONTROL | 2 +- ports/itpp/fix-linux.patch | 10 +- ports/itpp/fix-uwp.patch | 11 +- ports/itpp/portfile.cmake | 14 +- ports/mpg123/CONTROL | 2 +- ports/mpg123/portfile.cmake | 18 +- ports/qwt/CONTROL | 2 +- ports/qwt/build-shared-lib.patch | 13 -- ports/qwt/build-static-lib.patch | 13 -- ports/qwt/fix-dynamic-static.patch | 15 ++ ports/qwt/portfile.cmake | 27 ++- ports/sdl1/CONTROL | 2 +- ports/sdl1/SDL.vcxproj | 354 ------------------------------------ ports/sdl1/SDL_dynamic.vcxproj | 354 ++++++++++++++++++++++++++++++++++++ ports/sdl1/SDL_static.vcxproj | 354 ++++++++++++++++++++++++++++++++++++ ports/sdl1/SDLmain.vcxproj | 215 ---------------------- ports/sdl1/SDLmain_dynamic.vcxproj | 215 ++++++++++++++++++++++ ports/sdl1/SDLmain_static.vcxproj | 215 ++++++++++++++++++++++ ports/sdl1/portfile.cmake | 16 +- ports/sdl1/static-build.patch | 74 -------- 23 files changed, 1383 insertions(+), 919 deletions(-) delete mode 100644 ports/qwt/build-shared-lib.patch delete mode 100644 ports/qwt/build-static-lib.patch create mode 100644 ports/qwt/fix-dynamic-static.patch delete mode 100644 ports/sdl1/SDL.vcxproj create mode 100644 ports/sdl1/SDL_dynamic.vcxproj create mode 100644 ports/sdl1/SDL_static.vcxproj delete mode 100644 ports/sdl1/SDLmain.vcxproj create mode 100644 ports/sdl1/SDLmain_dynamic.vcxproj create mode 100644 ports/sdl1/SDLmain_static.vcxproj delete mode 100644 ports/sdl1/static-build.patch diff --git a/ports/ccfits/CONTROL b/ports/ccfits/CONTROL index 18937d5e7..f6eb51488 100644 --- 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 diff --git a/ports/ccfits/dll_exports.patch b/ports/ccfits/dll_exports.patch index 4ec4a8284..6321cbb4e 100644 --- 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 -+ { - public: - ++ class CCFITS_EXPORT FITS + { -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 @@ + public: +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 #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 -- 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 //#include //#include - #include +#include "ccfits_export.h" + #include 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 // FitsError @@ -432,7 +366,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP #include -@@ -287,21 +288,21 @@ +@@ -287,21 +288,21 @@ object. template void swap(std::vector& left, std::vector& 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& inArray); @@ -468,7 +402,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP template -@@ -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 ++#include + +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + + + #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} + ) + diff --git a/ports/ccfits/portfile.cmake b/ports/ccfits/portfile.cmake index 6aeecfd62..c3d2fef1e 100644 --- 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} diff --git a/ports/itpp/CONTROL b/ports/itpp/CONTROL index 623b2fc6b..95a49293b 100644 --- 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. \ No newline at end of file diff --git a/ports/itpp/fix-linux.patch b/ports/itpp/fix-linux.patch index 5e7bb64c0..18b66af5f 100644 --- 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); diff --git a/ports/itpp/fix-uwp.patch b/ports/itpp/fix-uwp.patch index 18e5fe4eb..69805922a 100644 --- 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 -+#include ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#include ++#endif ++ int gettimeofday(struct timeval* p, void*) { + union { diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake index 10faf4882..84fc651e4 100644 --- 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 diff --git a/ports/mpg123/CONTROL b/ports/mpg123/CONTROL index ad360039c..47692364e 100644 --- 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). \ No newline at end of file diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index ff7645390..8523c6cb7 100644 --- 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} diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL index 230203b34..c1271a72f 100644 --- 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 diff --git a/ports/qwt/build-shared-lib.patch b/ports/qwt/build-shared-lib.patch deleted file mode 100644 index 2a8447d52..000000000 --- a/ports/qwt/build-shared-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/qwtconfig.pri b/qwtconfig.pri -index 756231a..2dc3715 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 diff --git a/ports/qwt/build-static-lib.patch b/ports/qwt/build-static-lib.patch deleted file mode 100644 index 3e1b462ac..000000000 --- a/ports/qwt/build-static-lib.patch +++ /dev/null @@ -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 diff --git a/ports/qwt/fix-dynamic-static.patch b/ports/qwt/fix-dynamic-static.patch new file mode 100644 index 000000000..b608681f2 --- /dev/null +++ b/ports/qwt/fix-dynamic-static.patch @@ -0,0 +1,15 @@ +diff --git a/qwtconfig.pri b/qwtconfig.pri +index 1fe6055..441c69b 100644 +--- a/qwtconfig.pri ++++ b/qwtconfig.pri +@@ -72,7 +72,10 @@ QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features + # it will be a static library. + ###################################################################### + ++CONFIG(dynamic, dynamic|static) { ++ + QWT_CONFIG += QwtDll ++} + + ###################################################################### + # QwtPlot enables all classes, that are needed to use the QwtPlot diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake index 918914a01..002272e24 100644 --- 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 diff --git a/ports/sdl1/CONTROL b/ports/sdl1/CONTROL index ce37bc05d..59606dcb0 100644 --- 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. diff --git a/ports/sdl1/SDL.vcxproj b/ports/sdl1/SDL.vcxproj deleted file mode 100644 index 1db10bb76..000000000 --- a/ports/sdl1/SDL.vcxproj +++ /dev/null @@ -1,354 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} - SDL - - - - DynamicLibrary - v141 - false - - - DynamicLibrary - v141 - false - - - DynamicLibrary - v141 - false - - - DynamicLibrary - v141 - false - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.27924.0 - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - true - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - true - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - - - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - false - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/SDL.tlb - - - Disabled - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - MultiThreadedDLL - false - - .\Debug/SDL.pch - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Debug/SDL.dll - true - false - true - .\Debug/SDL.pdb - Windows - false - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/SDL.tlb - - - Disabled - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - MultiThreadedDLL - false - - .\Debug/SDL.pch - Level3 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Debug/SDL.dll - true - false - true - .\Debug/SDL.pdb - Windows - MachineX64 - false - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/SDL.tlb - - - OnlyExplicitInline - false - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - - .\Release/SDL.pch - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - /MACHINE:I386 %(AdditionalOptions) - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/SDL.dll - true - false - .\Release/SDL.pdb - Windows - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/SDL.tlb - - - OnlyExplicitInline - false - $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - - .\Release/SDL.pch - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - winmm.lib;dxguid.lib;%(AdditionalDependencies) - .\Release/SDL.dll - true - false - .\Release/SDL.pdb - Windows - MachineX64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ports/sdl1/SDL_dynamic.vcxproj b/ports/sdl1/SDL_dynamic.vcxproj new file mode 100644 index 000000000..1db10bb76 --- /dev/null +++ b/ports/sdl1/SDL_dynamic.vcxproj @@ -0,0 +1,354 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} + SDL + + + + DynamicLibrary + v141 + false + + + DynamicLibrary + v141 + false + + + DynamicLibrary + v141 + false + + + DynamicLibrary + v141 + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.27924.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/SDL.tlb + + + Disabled + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + .\Debug/SDL.pch + Level3 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Debug/SDL.dll + true + false + true + .\Debug/SDL.pdb + Windows + false + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/SDL.tlb + + + Disabled + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) + MultiThreadedDLL + false + + .\Debug/SDL.pch + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Debug/SDL.dll + true + false + true + .\Debug/SDL.pdb + Windows + MachineX64 + false + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/SDL.tlb + + + OnlyExplicitInline + false + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + + .\Release/SDL.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/SDL.dll + true + false + .\Release/SDL.pdb + Windows + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/SDL.tlb + + + OnlyExplicitInline + false + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + + .\Release/SDL.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/SDL.dll + true + false + .\Release/SDL.pdb + Windows + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ports/sdl1/SDL_static.vcxproj b/ports/sdl1/SDL_static.vcxproj new file mode 100644 index 000000000..c435662ab --- /dev/null +++ b/ports/sdl1/SDL_static.vcxproj @@ -0,0 +1,354 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} + SDL + + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.27924.0 + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/SDL.tlb + + + Disabled + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) + MultiThreadedDebug + false + + .\Debug/SDL.pch + Level3 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Debug/SDL.dll + true + false + true + .\Debug/SDL.pdb + Windows + false + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/SDL.tlb + + + Disabled + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) + MultiThreadedDebug + false + + .\Debug/SDL.pch + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Debug/SDL.dll + true + false + true + .\Debug/SDL.pdb + Windows + MachineX64 + false + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/SDL.tlb + + + OnlyExplicitInline + false + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + + .\Release/SDL.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/SDL.dll + true + false + .\Release/SDL.pdb + Windows + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/SDL.tlb + + + OnlyExplicitInline + false + $(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + + .\Release/SDL.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + winmm.lib;dxguid.lib;%(AdditionalDependencies) + .\Release/SDL.dll + true + false + .\Release/SDL.pdb + Windows + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ports/sdl1/SDLmain.vcxproj b/ports/sdl1/SDLmain.vcxproj deleted file mode 100644 index 228045d41..000000000 --- a/ports/sdl1/SDLmain.vcxproj +++ /dev/null @@ -1,215 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release_NoSTDIO - Win32 - - - Release_NoSTDIO - x64 - - - Release - Win32 - - - Release - x64 - - - - {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} - - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - StaticLibrary - v141 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>15.0.27924.0 - - - .\Release\ - .\Release\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - .\Release_NOSTDIO\ - .\Release_NOSTDIO\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - .\Debug\ - .\Debug\ - - - $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - .\Release/SDLmain.pch - Level3 - Default - - - - - X64 - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - .\Release/SDLmain.pch - Level3 - Default - - - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - .\Release_NOSTDIO/SDLmain.pch - Level3 - Default - - - - - X64 - - - OnlyExplicitInline - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - .\Release_NOSTDIO/SDLmain.pch - Level3 - Default - - - - - Disabled - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - - .\Debug/SDLmain.pch - Level3 - OldStyle - Default - - - - - X64 - - - Disabled - ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - - .\Debug/SDLmain.pch - Level3 - OldStyle - Default - - - - - - - - - \ No newline at end of file diff --git a/ports/sdl1/SDLmain_dynamic.vcxproj b/ports/sdl1/SDLmain_dynamic.vcxproj new file mode 100644 index 000000000..228045d41 --- /dev/null +++ b/ports/sdl1/SDLmain_dynamic.vcxproj @@ -0,0 +1,215 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release_NoSTDIO + Win32 + + + Release_NoSTDIO + x64 + + + Release + Win32 + + + Release + x64 + + + + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} + + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.27924.0 + + + .\Release\ + .\Release\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + .\Release_NOSTDIO\ + .\Release_NOSTDIO\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + .\Debug\ + .\Debug\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + .\Release/SDLmain.pch + Level3 + Default + + + + + X64 + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + .\Release/SDLmain.pch + Level3 + Default + + + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + .\Release_NOSTDIO/SDLmain.pch + Level3 + Default + + + + + X64 + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + .\Release_NOSTDIO/SDLmain.pch + Level3 + Default + + + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + + .\Debug/SDLmain.pch + Level3 + OldStyle + Default + + + + + X64 + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + + .\Debug/SDLmain.pch + Level3 + OldStyle + Default + + + + + + + + + \ No newline at end of file diff --git a/ports/sdl1/SDLmain_static.vcxproj b/ports/sdl1/SDLmain_static.vcxproj new file mode 100644 index 000000000..3f3b6ca01 --- /dev/null +++ b/ports/sdl1/SDLmain_static.vcxproj @@ -0,0 +1,215 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release_NoSTDIO + Win32 + + + Release_NoSTDIO + x64 + + + Release + Win32 + + + Release + x64 + + + + {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} + + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + StaticLibrary + v141 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>15.0.27924.0 + + + .\Release\ + .\Release\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + .\Release_NOSTDIO\ + .\Release_NOSTDIO\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + .\Debug\ + .\Debug\ + + + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + + .\Release/SDLmain.pch + Level3 + Default + + + + + X64 + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreaded + true + + .\Release/SDLmain.pch + Level3 + Default + + + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) + true + MultiThreaded + true + + .\Release_NOSTDIO/SDLmain.pch + Level3 + Default + + + + + X64 + + + OnlyExplicitInline + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;NO_STDIO_REDIRECT;%(PreprocessorDefinitions) + true + MultiThreaded + true + + .\Release_NOSTDIO/SDLmain.pch + Level3 + Default + + + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDebug + + .\Debug/SDLmain.pch + Level3 + OldStyle + Default + + + + + X64 + + + Disabled + ..\..\include;..\..\include\SDL;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDebug + + .\Debug/SDLmain.pch + Level3 + OldStyle + Default + + + + + + + + + \ No newline at end of file diff --git a/ports/sdl1/portfile.cmake b/ports/sdl1/portfile.cmake index 2cbdfc42c..4e8d512df 100644 --- 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 diff --git a/ports/sdl1/static-build.patch b/ports/sdl1/static-build.patch deleted file mode 100644 index 89bc39ddc..000000000 --- a/ports/sdl1/static-build.patch +++ /dev/null @@ -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 @@ - -- DynamicLibrary -+ StaticLibrary - v141 -@@ -31,3 +31,3 @@ - -- DynamicLibrary -+ StaticLibrary - v141 -@@ -36,3 +36,3 @@ - -- DynamicLibrary -+ StaticLibrary - v141 -@@ -41,3 +41,3 @@ - -- DynamicLibrary -+ StaticLibrary - v141 -@@ -100,3 +100,3 @@ - _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) -- MultiThreadedDLL -+ MultiThreadedDebug - false -@@ -137,3 +137,3 @@ - _CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions) -- MultiThreadedDLL -+ MultiThreadedDebug - false -@@ -176,3 +176,3 @@ - true -- MultiThreadedDLL -+ MultiThreaded - false -@@ -213,3 +213,3 @@ - true -- MultiThreadedDLL -+ MultiThreaded - false ---- 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 @@ - true -- MultiThreadedDLL -+ MultiThreaded - true -@@ -140,3 +140,3 @@ - true -- MultiThreadedDLL -+ MultiThreaded - true -@@ -154,3 +154,3 @@ - true -- MultiThreadedDLL -+ MultiThreaded - true -@@ -171,3 +171,3 @@ - true -- MultiThreadedDLL -+ MultiThreaded - true -@@ -184,3 +184,3 @@ - _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) -- MultiThreadedDLL -+ MultiThreadedDebug - -@@ -200,3 +200,3 @@ - _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) -- MultiThreadedDLL -+ MultiThreadedDebug - -- cgit v1.2.3