Merge branch 'master' of git://github.com/Microsoft/vcpkg

2024-11-24 20:19:00 +08:00 · 2017-03-12 17:44:06 -04:00 · 2017-03-12 17:44:06 -04:00 · 2f42035ab4
commit 2f42035ab4
parent e02e85626f 1c9873a0da
462 changed files with 17571 additions and 4364 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,265 @@
+vcpkg (0.0.76)
+--------------
+  * Add ports:
+    - ffmpeg               3.2.4-2
+    - fftw3                3.3.6-p11
+    - flatbuffers          1.6.0
+    - netcdf-c             4.4.1.1-1
+    - netcdf-cxx4          4.3.0
+    - portaudio            19.0.6.00
+    - vtk                  7.1.0
+  * Update ports:
+    - azure-storage-cpp    2.6.0            -> 3.0.0
+    - boost                1.63             -> 1.63-2
+    - bullet3              2.83.7.98d4780   -> 2.86.1
+    - catch                1.5.7            -> 1.8.1
+    - cppwinrt             1.010.0.14393.0  -> feb2017_refresh-14393
+    - hdf5                 1.8.18           -> 1.10.0-patch1-1
+    - libflac              1.3.2            -> 1.3.2-1
+    - libpng               1.6.24-1         -> 1.6.28
+    - lua                  5.3.3-2          -> 5.3.4
+    - msmpi                8.0              -> 8.0-1
+    - openjpeg             2.1.2            -> 2.1.2-1
+    - poco                 1.7.6-3          -> 1.7.6-4
+    - szip                 2.1              -> 2.1-1
+    - zeromq               4.2.0            -> 4.2.2
+  * `vcpkg` now launches external commands (most notably builds) in a sanitized environment
+  * Better proxy handling when fetching dependencies (cmake/git/nuget)
+  * Fix more VS2017 issues
+  * Fixes and improvements in existing portfiles and the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  MON, 10 Mar 2017 17:45:00 -0800
+
+
+vcpkg (0.0.75)
+--------------
+  * Add ports:
+    - dlib                 19.2
+    - gtk                  3.22.8
+    - pqp                  1.3
+    - pugixml              1.8.1
+  * Update ports:
+    - clockutils           1.1.1            -> 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5
+    - grpc                 1.1.0-dev-1674f65-2 -> 1.1.2-1
+    - libflac              1.3.1-1          -> 1.3.2
+    - liblzma              5.2.2            -> 5.2.3
+    - libmysql             5.7.17           -> 5.7.17-1
+    - lz4                  1.7.4.2          -> 1.7.5
+    - mongo-cxx-driver     3.0.3            -> 3.0.3-1
+    - nana                 1.4.1            -> 1.4.1-66be23c9204c5567d1c51e6f57ba23bffa517a7c
+    - opengl               10.0.10240.0     -> 0.0-3
+    - protobuf             3.0.2            -> 3.2.0
+    - qt5                  5.7.1-2          -> 5.7.1-5
+    - spdlog               0.11.0           -> 0.12.0
+  * Numerous improvements in Visual Studio, MSBuild and Windows SDK auto-detection
+  * `vcpkg integrate install` now outputs the specific toolchain file to use for CMake integration
+  * All commands now checks for `--options` and will issue an error on unknown options.
+    - Previously only commands with options would do this (for example `vcpkg remove --purge <pkg>`) and commands with no options would ignore them, for example `vcpkg install --purge <pkg>`
+  * Update version of the automatically acquired JOM, python
+    - Also, for python: automatically acquire the 32-bit versions instead of the 64-bit ones
+  * Fixes and improvements in existing portfiles and the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  MON, 27 Feb 2017 14:00:00 -0800
+
+
+vcpkg (0.0.74)
+--------------
+  * Bump required version & auto-downloaded version of `cmake` to 3.8.0 (was 3.7.x). This fixes UWP builds with Visual Studio 2017
+  * Fix `vcpkg build` not printing out the missing dependencies on fail
+  * Fixes and improvements in the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  THU, 16 Feb 2017 18:15:00 -0800
+
+
+vcpkg (0.0.73)
+--------------
+  * Add ports:
+    - gdk-pixbuf           2.36.5
+    - openvr               1.0.5
+  * Update ports:
+    - lmdb                 0.9.18-1         -> 0.9.18-2
+    - opencv               3.1.0-1          -> 3.2.0
+    - sqlite3              3.15.0           -> 3.17.0
+  * Add functions to correctly find the "Program Files" folders in all parts of `vcpkg` (C++, CMake, powershell)
+  * Flush std::cout before launching an external process. Fixes issues when redirecting std::cout to a file
+  * Update version of the automatically acquired nasm. Resolves build failure with libjpeg-turbo
+  * Change the format of the listfile. The file is now sorted and directories now have a trailing slash so they can easily be identified.
+     - Old listfiles will be automatically updated on first access. This will happen to all old listfiles when a new package is installed (`vcpkg install`) or after a call to `vcpkg owns`.
+  * Fixes and improvements in existing portfiles and the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  WED, 15 Feb 2017 19:30:00 -0800
+
+
+vcpkg (0.0.72)
+--------------
+  * Add ports:
+    - cuda                 8.0
+    - hdf5                 1.8.18
+    - lcms                 2.8
+    - libepoxy             1.4.0-2432daf-1
+    - libnice              0.1.13
+    - msmpi                8.0
+    - parmetis             4.0.3
+    - sqlite-modern-cpp    2.4
+    - websocketpp          0.7.0
+  * Update ports:
+    - asio                 1.10.6           -> 1.10.8
+    - aws-sdk-cpp          1.0.47           -> 1.0.61
+    - bond                 5.0.0-4-g53ea136 -> 5.2.0
+    - cpprestsdk           2.9.0-1          -> 2.9.0-2
+    - fmt                  3.0.1-1          -> 3.0.1-4
+    - grpc                 1.1.0-dev-1674f65-1 -> 1.1.0-dev-1674f65-2
+    - libraw               0.17.2-2         -> 0.18.0-1
+    - libvorbis            1.3.5-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee -> 1.3.5-1-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee
+    - poco                 1.7.6-2          -> 1.7.6-3
+    - rapidjson            1.0.2-1          -> 1.1.0
+    - sfml                 2.4.1            -> 2.4.2
+    - wt                   3.3.6-2          -> 3.3.6-3
+  * Introduce Build Policies:
+     - Packages with special characteristics (e.g. CUDA) can now use Build Policies to control which post-build checks apply to them.
+  * Improve support for Visual Studio 2017
+    - Add auto-detection for Windows SDK
+    - Fixed various issues with `bootstrap.ps1` and VS2017 support
+  * Automatic acquisition of perl now uses the 32-bit version isntead of the 64-bit version
+  * Fix `vcpkg remove --purge` not applying to non-installed packages
+  * Fixes and improvements in existing portfiles and the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  TUE, 14 Feb 2017 11:30:00 -0800
+
+
+vcpkg (0.0.71)
+--------------
+  * Add ports:
+    - atk                  2.22.0
+    - fontconfig           2.12.1
+    - opus                 1.1.4
+    - pango                1.40.3
+    - xerces-c             3.1.4
+  * Update ports:
+    - boost                1.62-11          -> 1.63
+    - cairo                1.14.6           -> 1.15.4
+    - directxtk            dec2016          -> dec2016-1
+    - fltk                 1.3.4-1          -> 1.3.4-2
+    - gdal                 1.11.3           -> 1.11.3-1
+    - harfbuzz             1.3.4            -> 1.3.4-2
+    - libarchive           3.2.2            -> 3.2.2-2
+    - libmariadb           2.3.1            -> 2.3.2
+    - mpir                 2.7.2            -> 2.7.2-1
+    - openssl              1.0.2j-2         -> 1.0.2k-2
+    - wt                   3.3.6            -> 3.3.6-2
+  * Improve `vcpkg remove`:
+     - Now shows all dependencies that need to be removed instead of just the immediate dependencies
+     - Add `--recurse` option that removes all dependencies
+     - Improve messages
+  * Improve support for Visual Studio 2017
+    - Better VS2017 detection
+    - Fixed various issues with `bootstrap.ps1` and VS2017 support
+  * Fix `vcpkg_copy_pdbs()` under non-English locale
+  * Notable changes for buiding the `vcpkg` tool:
+    - Restructure `vcpkg` project hierarchy. Now only has 4 projects (down from 6). Most of the code now lives under vcpkglib.vcxproj
+    - Enable multiprocessor compilation
+    - Disable MinimalRebuild
+    - Use precompiled headers
+  * Fixes and improvements in existing portfiles and the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  MON, 30 Jan 2017 23:00:00 -0800
+
+
+vcpkg (0.0.70)
+--------------
+  * Add ports:
+    - fltk                 1.3.4-1
+    - glib                 2.50.2
+    - lzo                  2.09
+    - uvatlas              sept2016
+  * Update ports:
+    - dx                   1.0.0            -> 1.0.1
+    - libmysql             5.7.16           -> 5.7.17
+  * Add support for Visual Studio 2017
+    - Previously, you could use Visual Studio 2017 for your own application and `vcpkg` integration would work, but you needed to have Visual Studio 2015 to build `vcpkg` itself as well as the libraries. This requirement has now been removed
+    - If both Visual Studio 2015 and Visual Studio 2017 are installed, Visual Studio 2017 tools will be preferred over those of Visual Studio 2015
+  * Bump required version & auto-downloaded version of `cmake` to 3.7.2 (was 3.5.x), which includes generators for Visual Studio 2017
+  * Bump auto-downloaded version of `nuget` to 3.5.0 (was 3.4.3)
+  * Bump auto-downloaded version of `git` to 2.11.0 (was 2.8.3)
+  * Fixes and improvements in existing portfiles and the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  MON, 23 Jan 2017 19:50:00 -0800
+
+
+vcpkg (0.0.67)
+--------------
+  * Add ports:
+    - cereal               1.2.1
+    - directxmesh          oct2016
+    - directxtex           dec2016
+    - metis                5.1.0
+    - sdl2-image           2.0.1
+    - szip                 2.1
+  * Update ports:
+    - ace                  6.4.0            -> 6.4.2
+    - boost                1.62-9           -> 1.62-11
+    - curl                 7.51.0-2         -> 7.51.0-3
+    - directxtk            oct2016-1        -> dec2016
+    - directxtk12          oct2016          -> dec2016
+    - freetype             2.6.3-3          -> 2.6.3-4
+    - glew                 2.0.0            -> 2.0.0-1
+    - grpc                 1.1.0-dev-1674f65 -> 1.1.0-dev-1674f65-1
+    - http-parser          2.7.1            -> 2.7.1-1
+    - libssh2              1.8.0            -> 1.8.0-1
+    - libwebsockets        2.0.0            -> 2.0.0-1
+    - openssl              1.0.2j-1         -> 1.0.2j-2
+    - tiff                 4.0.6-1          -> 4.0.6-2
+    - zlib                 1.2.10           -> 1.2.11
+  * Add 7z to `vcpkg_find_acquire_program.cmake`
+  * Enhance `vcpkg_build_cmake.cmake` and `vcpkg_install_cmake.cmake`:
+    - Add option to disable parallel building (it is enabled by default)
+    - Add option to use the 64-bit toolset (for the 32-bit builds; output binaries are still 32-bit)
+  * Fix bug in `applocal.ps1` that would infinitely recurse when there were no depenndencies
+  * Fixes and improvements in existing portfiles and the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  WED, 18 Jan 2017 13:45:00 -0800
+
+
+vcpkg (0.0.66)
+--------------
+  * Add ports:
+    - antlr4               4.6
+    - bzip2                1.0.6
+    - dx                   1.0.0
+    - gli                  0.8.2
+    - libarchive           3.2.2
+    - libffi               3.1
+    - liblzma              5.2.2
+    - libmodplug           0.8.8.5-bb25b05
+    - libsigcpp            2.10
+    - lmdb                 0.9.18-1
+    - lz4                  1.7.4.2
+    - ogre                 1.9.0
+    - qwt                  6.1.3
+    - smpeg2               2.0.0
+    - spirv-tools          1.1-f72189c249ba143c6a89a4cf1e7d53337b2ddd40
+  * Update ports:
+    - aws-sdk-cpp          1.0.34-1         -> 1.0.47
+    - azure-storage-cpp    2.5.0            -> 2.6.0
+    - boost                1.62-8           -> 1.62-9
+    - chakracore           1.3.1            -> 1.4.0
+    - freetype             2.6.3-2          -> 2.6.3-3
+    - icu                  58.1             -> 58.2-1
+    - libbson              1.5.0-rc6        -> 1.5.1
+    - libvorbis                             -> 1.3.5-143caf4023a90c09a5eb685fdd46fb9b9c36b1ee
+    - lua                  5.3.3-1          -> 5.3.3-2
+    - mongo-c-driver       1.5.0-rc6        -> 1.5.1
+    - pixman               0.34.0           -> 0.34.0-1
+    - qt5                  5.7-1            -> 5.7.1-2
+    - sdl2                 2.0.5            -> 2.0.5-2
+    - zlib                 1.2.8            -> 1.2.10
+  * Improvements in pre-install checks:
+    - Refactor file-exists-check. Improved clarity and performance.
+  * Fixes and improvements in existing portfiles and the `vcpkg` tool itself
+
+-- vcpkg team <vcpkg@microsoft.com>  TUE, 10 Jan 2017 17:15:00 -0800
+
+
 vcpkg (0.0.65)
 --------------
  * Add ports:
--- a/README.md
+++ b/README.md
@ -7,7 +7,9 @@ For short description of available commands, run `vcpkg help`.

 ## Quick Start
 Prerequisites:
- Visual Studio 2015 Update 3
+- Visual Studio 2015 Update 3 or
+- Visual Studio 2017
+- CMake 3.8.0 or higher (note: downloaded automatically if not found)
 - `git.exe` available in your path

 Clone this repository, then run
@ -22,7 +24,7 @@ Install any packages with
 ```
 C:\src\vcpkg> .\vcpkg install sdl2 curl
 ```
-Finally, create a New Project (or open an existing one) in Visual Studio 2015 or Visual Studio "15" Preview. You can now `#include` and use any of the installed libraries.
+Finally, create a New Project (or open an existing one) in Visual Studio 2015 or Visual Studio 2017. You can now `#include` and use any of the installed libraries.

 ## Examples
 See the [`docs\EXAMPLES.md`](docs/EXAMPLES.md) document for specific walkthroughs, including using a package and adding a new package.
--- a/docs/EXAMPLES.md
+++ b/docs/EXAMPLES.md
@ -3,7 +3,7 @@
 ## Overview
 Vcpkg helps you get C and C++ libraries on Windows.

-For short description of available commands, run `vcpkg help`.
+For short description of available commands, run `.\vcpkg help`.

 ## Table of Contents
 - <a href="#example-1">Example 1: Using Sqlite</a>
@ -64,7 +64,7 @@ Package sqlite3:x86-windows is installed
 ```
 In addition to installing, `vcpkg` caches a pristine copy of the built library inside the `packages\` directory -- in this case, `packages\sqlite3_x86-windows`. This allows you to quickly uninstall and reinstall the library in the future using the `remove` and `install` commands.

-We can check that cpprestsdk was successfully installed for x86 windows desktop by running the `list` command.
+We can check that sqlite3 was successfully installed for x86 windows desktop by running the `list` command.
 ```
 PS D:\src\vcpkg> .\vcpkg list
 sqlite3:x86-windows         3.15.0           SQLite is a software library that implements a se...
@ -72,10 +72,10 @@ sqlite3:x86-windows         3.15.0           SQLite is a software library that i

 To install for other architectures and platforms such as Universal Windows Platform or x64 Desktop, you can suffix the package name with `:<target>`.
 ```
-PS D:\src\vcpkg> .\vcpkg install cpprestsdk:x86-uwp zlib:x64-windows
+PS D:\src\vcpkg> .\vcpkg install sqlite3:x86-uwp zlib:x64-windows
 ```

-See `vcpkg help triplet` for all supported targets.
+See `.\vcpkg help triplet` for all supported targets.

 <a name="example-1-2"></a>
 ### Step 2: Use
@ -95,7 +95,7 @@ Installing new libraries will make them instantly available.

 You can now simply use File -> New Project in Visual Studio 2015 or Visual Studio "15" Preview and the library will be automatically available. For Sqlite, you can try out their [C/C++ sample](https://sqlite.org/quickstart.html).

-To remove the integration for your user, you can use `vcpkg integrate remove`.
+To remove the integration for your user, you can use `.\vcpkg integrate remove`.

 <a name="example-1-2-b"></a>
 #### Option B: CMake (Toolchain File)
@ -150,9 +150,9 @@ PS D:\src\cmake-test\build> .\Debug\main.exe

 Libraries are installed into the `installed\` subfolder, partitioned by architecture (e.g. x86-windows):
 * The header files are installed to `installed\x86-windows\include`
-* Release `.lib` files are installed to `installed\x86-windows\lib`
+* Release `.lib` files are installed to `installed\x86-windows\lib` or `installed\x86-windows\lib\manual-link`
 * Release `.dll` files are installed to `installed\x86-windows\bin`
-* Debug `.lib` files are installed to `installed\x86-windows\debug\lib`
+* Debug `.lib` files are installed to `installed\x86-windows\debug\lib` or `installed\x86-windows\debug\lib\manual-link`
 * Debug `.dll` files are installed to `installed\x86-windows\debug\bin`

 See your build system specific documentation for how to use prebuilt binaries.
--- a/docs/PRIVACY.md
+++ b/docs/PRIVACY.md
@ -5,14 +5,14 @@
 ## Do you collect telemetry data? What is it used for? 

 We do collect telemetry data from usage of "vcpkg.exe". We explicitly ONLY collect information from invocations of the tool itself; we do NOT add any tracking information into the produced libraries. 
-We use this information to understand the usage the issue and what we can do to improve the tool. 
+We use this information to understand usage issues and to guide tool improvements.


 ## What telemetry is collected? 

 We collect the command line used, the time of invocation, and how long the command took. Some commands also add additional calculated information (such as the full set of libraries to install). We generate a completely random UUID on first use and attach it to each event. For this preview, we do not offer a mechanism to disable this data collection since it is critical for improving the product. In the full release, you will be able to opt-out with a simple configuration. For more information about how Microsoft protects your privacy, see https://privacy.microsoft.com/en-us/privacy.

-Here is an example of an event for the command line "vcpkg install zlib": 
+Here is an example of an event for the command line `vcpkg install zlib`:
 ```
 [{
    "ver": 1, 
@ -40,7 +40,7 @@ Here is an example of an event for the command line "vcpkg install zlib":
    } 
 }] 
 ```
-In the source code (included in every release), you can search for calls to the functions "TrackProperty" and "TrackMetric" to see every specific data point we collect. 
+In the source code (included in `toolsrc\`), you can search for calls to the functions `TrackProperty()` and `TrackMetric()` to see every specific data point we collect.


 ## Is the data stored on my system? 
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@ -1,3 +1,3 @@
 Source: ace
-Version: 6.4.0
+Version: 6.4.2
 Description: The ADAPTIVE Communication Environment
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@ -5,9 +5,9 @@ endif()
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.0.zip"
-    FILENAME "ACE-6.4.0.zip"
-    SHA512 3543291332b96cf06a966dedda617169e8db051cebbbc4f05cdc2c2c9e7908174f8ed67bc152bbcd57541279d3addb1138f1fc092468e856c2bb04ee6ad2b95a
+    URLS "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.2.zip"
+    FILENAME "ACE-6.4.2.zip"
+    SHA512 587872ef1fb197829a085f4449d7beb2f161a782a2a552d26324154ae85fd463092e3c2a4dd0c6d93079ae798cc43269117ea069855b0af6804b49cad0a8c2ca
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/antlr4/portfile.cmake
+++ b/ports/antlr4/portfile.cmake
@ -6,69 +6,70 @@ vcpkg_download_distfile(ARCHIVE
    FILENAME "antlr4-cpp-runtime-4.6-source.zip"
    SHA512 e123c2227e41ce80da5a3758725a018690ed70a4e10c23da26c966259e6bdafa192f4363f5a7e1181ef9a47bf3cc50d6b0ca7b26c8dd2b19222a7edf54de8de2
 )
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src
-    PATCHES     ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch
-)
-
-if (${VCPKG_LIBRARY_LINKAGE} STREQUAL static)
-	set(DEBUG_CONFIG   "Debug Static")
-	set(RELEASE_CONFIG "Release Static")
-else()
-	set(DEBUG_CONFIG   "Debug DLL")
-	set(RELEASE_CONFIG "Release DLL")
-endif()
-
-vcpkg_build_msbuild(
-	PROJECT_PATH ${SOURCE_PATH}/antlr4cpp-vs2015.vcxproj
-	DEBUG_CONFIGURATION ${DEBUG_CONFIG}
-	RELEASE_CONFIGURATION ${RELEASE_CONFIG}
-)
-
-file (MAKE_DIRECTORY 
-	${CURRENT_PACKAGES_DIR}/include)
-FILE(COPY            ${SOURCE_PATH}/src/
-     DESTINATION     ${CURRENT_PACKAGES_DIR}/include
-     FILES_MATCHING PATTERN "*.h")
-
-file (MAKE_DIRECTORY 
-	${CURRENT_PACKAGES_DIR}/lib
-	${CURRENT_PACKAGES_DIR}/debug/lib)
-
-file(COPY       ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.lib
-	DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-file(COPY       ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.lib
-	DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-
-if (${VCPKG_LIBRARY_LINKAGE} STREQUAL static)
-	vcpkg_apply_patches(
-		SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
-		PATCHES     ${CMAKE_CURRENT_LIST_DIR}/static.patch
-	)
-else()
-	file (MAKE_DIRECTORY 
-		${CURRENT_PACKAGES_DIR}/bin
-		${CURRENT_PACKAGES_DIR}/debug/bin)
-	
-	file(COPY
-		${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.dll
-		${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.pdb
-		DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-	file(COPY
-		${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.dll
-		${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.pdb
-		DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-endif()
-

 # license not exist in antlr folder.
 vcpkg_download_distfile(LICENSE
-	URLS https://raw.githubusercontent.com/antlr/antlr4/master/LICENSE.txt
-	FILENAME "antlr4-copyright"
-	SHA512 c72ae3d5c9f3f07160405b5ca44f01116a9602d82291d6cd218fcc5ec6e8baf985e4baa2acf3d621079585385708bd171c96ef44dd808e60c40a48bc1f56c9ae
+    URLS https://raw.githubusercontent.com/antlr/antlr4/4.6/LICENSE.txt
+    FILENAME "antlr4-copyright"
+    SHA512 c72ae3d5c9f3f07160405b5ca44f01116a9602d82291d6cd218fcc5ec6e8baf985e4baa2acf3d621079585385708bd171c96ef44dd808e60c40a48bc1f56c9ae
 )
+
+vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src
+    PATCHES     ${CMAKE_CURRENT_LIST_DIR}/crt_mt.patch
+)
+
+if (${VCPKG_LIBRARY_LINKAGE} STREQUAL static)
+    set(DEBUG_CONFIG   "Debug Static")
+    set(RELEASE_CONFIG "Release Static")
+else()
+    set(DEBUG_CONFIG   "Debug DLL")
+    set(RELEASE_CONFIG "Release DLL")
+endif()
+
+vcpkg_build_msbuild(
+    PROJECT_PATH ${SOURCE_PATH}/antlr4cpp-vs2015.vcxproj
+    DEBUG_CONFIGURATION ${DEBUG_CONFIG}
+    RELEASE_CONFIGURATION ${RELEASE_CONFIG}
+)
+
+file (MAKE_DIRECTORY
+    ${CURRENT_PACKAGES_DIR}/include)
+FILE(COPY            ${SOURCE_PATH}/src/
+     DESTINATION     ${CURRENT_PACKAGES_DIR}/include
+     FILES_MATCHING PATTERN "*.h")
+
+file (MAKE_DIRECTORY
+    ${CURRENT_PACKAGES_DIR}/lib
+    ${CURRENT_PACKAGES_DIR}/debug/lib)
+
+file(COPY       ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(COPY       ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+
+if (${VCPKG_LIBRARY_LINKAGE} STREQUAL static)
+    vcpkg_apply_patches(
+        SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
+        PATCHES     ${CMAKE_CURRENT_LIST_DIR}/static.patch
+    )
+else()
+    file (MAKE_DIRECTORY
+        ${CURRENT_PACKAGES_DIR}/bin
+        ${CURRENT_PACKAGES_DIR}/debug/bin)
+
+    file(COPY
+        ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.dll
+        ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG}/antlr4-runtime.pdb
+        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(COPY
+        ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.dll
+        ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.pdb
+        DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+endif()
+
 file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/antlr4 RENAME copyright)

 message(STATUS "Installing done")
--- a/ports/asio/CONTROL
+++ b/ports/asio/CONTROL
@ -1,3 +1,3 @@
-Source: asio
-Version: 1.10.6
-Description: Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.
+Source: asio
+Version: 1.10.8
+Description: Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.
--- a/ports/asio/portfile.cmake
+++ b/ports/asio/portfile.cmake
@ -1,10 +1,10 @@
 #header-only library
 include(vcpkg_common_functions)
-SET(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/asio-asio-1-10-6/asio/)
+SET(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/asio-asio-1-10-8/asio/)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/chriskohlhoff/asio/archive/asio-1-10-6.zip"
-    FILENAME "asio-1-10-6.zip"
-    SHA512 7e3fde7e88d305d19b88482b73c8b7a41751d65e81bd23dd8ef45eb4e3ef3a10629696b4d347e5a68f08d6fb2dede15a2f38c7ee8d18ac88be769215542da4c6
+    URLS "https://github.com/chriskohlhoff/asio/archive/asio-1-10-8.zip"
+    FILENAME "asio-1-10-8.zip"
+    SHA512 bc9794a20fc7844a2a9d22bfa418005f61defbcecdd612daba0d317e6f8fc5a61d3a3b2d7d557b92584294b8adfccc3c47a8f0441f3e34a47a0f715ca1ba0e5b
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/atk/CMakeLists.txt
+++ b/ports/atk/CMakeLists.txt
@ -0,0 +1,129 @@
+cmake_minimum_required(VERSION 3.0)
+project(atk)
+
+set(ATK_LIB_SUFFIX 1.0)
+set(ATK_DLL_SUFFIX 1)
+set(GLIB_LIB_VERSION 2.0)
+
+if(BUILD_SHARED_LIBS)
+    set(ATK_EXPORT_MACRO DLL_EXPORT)
+endif()
+
+# generate atkmarshal.c and atkmarshal.h source files
+# glib-genmarshal should be installed along with glib
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/atk/atkmarshal.h OR NOT EXISTS ${CMAKE_SOURCE_DIR}/atk/atkmarshal.c)
+    find_program(GLIB_GENMARSHAL glib-genmarshal PATH_SUFFIXES glib)
+    execute_process(
+        COMMAND ${GLIB_GENMARSHAL} --prefix=atk_marshal atkmarshal.list --header
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/atk
+        OUTPUT_FILE ${CMAKE_SOURCE_DIR}/atk/atkmarshal.h)
+    execute_process(
+        COMMAND ${GLIB_GENMARSHAL} --prefix=atk_marshal atkmarshal.list --body
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/atk
+        OUTPUT_FILE ${CMAKE_SOURCE_DIR}/atk/atkmarshal.c)
+endif()
+
+configure_file(config.h.win32 ${CMAKE_SOURCE_DIR}/config.h COPYONLY)
+add_definitions(-DHAVE_CONFIG_H)
+include_directories(. ./atk)
+
+find_path(GLIB_INCLUDE_DIR glib.h)
+find_library(GLIB_GLIB_LIBRARY glib-${GLIB_LIB_VERSION})
+find_library(GLIB_GOBJECT_LIBRARY gobject-${GLIB_LIB_VERSION})
+find_library(GLIB_GMODULE_LIBRARY gmodule-${GLIB_LIB_VERSION})
+set(GLIB_LIBRARIES ${GLIB_GLIB_LIBRARY} ${GLIB_GOBJECT_LIBRARY} ${GLIB_GMODULE_LIBRARY})
+
+find_path(LIBINTL_INCLUDE_DIR libintl.h)
+find_library(LIBINTL_LIBRARY NAMES libintl intl)
+
+set(ATK_SOURCES
+    atk/atkaction.c
+    atk/atkcomponent.c
+    atk/atkdocument.c
+    atk/atkeditabletext.c
+    atk/atkgobjectaccessible.c
+    atk/atkhyperlink.c
+    atk/atkhyperlinkimpl.c
+    atk/atkhypertext.c
+    atk/atkimage.c
+    atk/atknoopobject.c
+    atk/atknoopobjectfactory.c
+    atk/atkobject.c
+    atk/atkobjectfactory.c
+    atk/atkplug.c
+    atk/atkprivate.c
+    atk/atkrange.c
+    atk/atkregistry.c
+    atk/atkrelation.c
+    atk/atkrelationset.c
+    atk/atkselection.c
+    atk/atksocket.c
+    atk/atkstate.c
+    atk/atkstateset.c
+    atk/atkstreamablecontent.c
+    atk/atktable.c
+    atk/atktablecell.c
+    atk/atktext.c
+    atk/atkutil.c
+    atk/atkmisc.c
+    atk/atkvalue.c
+    atk/atkversion.c
+    atk/atkwindow.c
+    atk/atk-enum-types.c)
+
+add_library(atk ${ATK_SOURCES})
+target_compile_definitions(atk PRIVATE ATK_COMPILATION ${ATK_EXPORT_MACRO} G_DISABLE_SINGLE_INCLUDES ATK_LOCALEDIR="/dummy/share/locale")
+target_link_libraries(atk ${LIBINTL_LIBRARY} ${GLIB_LIBRARIES})
+target_include_directories(atk PRIVATE ${GLIB_INCLUDE_DIR} ${LIBINTL_INCLUDE_DIR})
+
+set_target_properties(atk PROPERTIES 
+    OUTPUT_NAME atk-${ATK_DLL_SUFFIX}
+    ARCHIVE_OUTPUT_NAME atk-${ATK_LIB_SUFFIX})
+
+install(TARGETS atk RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
+
+if(NOT ATK_SKIP_HEADERS)
+    install(FILES
+        atk/atk.h
+        atk/atkaction.h
+        atk/atkcomponent.h
+        atk/atkdocument.h
+        atk/atkeditabletext.h
+        atk/atkgobjectaccessible.h
+        atk/atkhyperlink.h
+        atk/atkhyperlinkimpl.h
+        atk/atkhypertext.h
+        atk/atknoopobject.h
+        atk/atknoopobjectfactory.h
+        atk/atkobject.h
+        atk/atkobjectfactory.h
+        atk/atkplug.h
+        atk/atkimage.h
+        atk/atkrange.h
+        atk/atkregistry.h
+        atk/atkrelation.h
+        atk/atkrelationtype.h
+        atk/atkrelationset.h
+        atk/atkselection.h
+        atk/atksocket.h
+        atk/atkstate.h
+        atk/atkstateset.h
+        atk/atkstreamablecontent.h
+        atk/atktable.h
+        atk/atktablecell.h
+        atk/atktext.h
+        atk/atkutil.h
+        atk/atkmisc.h
+        atk/atkvalue.h
+        atk/atkwindow.h
+        atk/atkversion.h
+        atk/atk-enum-types.h
+        atk/atkversion.h
+        DESTINATION include/atk)
+endif()
+
+message(STATUS "Link-time dependencies:")
+message(STATUS "  " ${LIBINTL_LIBRARY})
+foreach(GL ${GLIB_LIBRARIES})
+    message(STATUS "  " ${GL})
+endforeach()
--- a/ports/atk/CONTROL
+++ b/ports/atk/CONTROL
@ -0,0 +1,4 @@
+Source: atk
+Version: 2.22.0
+Description: GNOME Accessibility Toolkit
+Build-Depends: glib, gettext
--- a/ports/atk/portfile.cmake
+++ b/ports/atk/portfile.cmake
@ -0,0 +1,28 @@
+# ATK uses DllMain
+if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    message(STATUS "Warning: Static building not supported. Building dynamic.")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+endif()
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/atk-2.22.0)
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://ftp.gnome.org/pub/GNOME/sources/atk/2.22/atk-2.22.0.tar.xz"
+    FILENAME "atk-2.22.0.tar.xz"
+    SHA512 af3f6197eb97de869ee706f19564449b02c1444c413e5418323e4bf4c8cf1d98c7c8baa25189f6879d63606d4bc75f33799cb901f4697c087e868bb9a5643cba
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DCMAKE_PROGRAM_PATH=${CURRENT_INSTALLED_DIR}/tools/glib
+    OPTIONS_DEBUG
+        -DATK_SKIP_HEADERS=ON)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/atk)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/atk/COPYING ${CURRENT_PACKAGES_DIR}/share/atk/copyright)
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@ -1,3 +1,3 @@
 Source: aws-sdk-cpp
-Version: 1.0.47
+Version: 1.0.61
 Description: AWS SDK for C++
--- a/ports/aws-sdk-cpp/disable_warning_as_error.patch
+++ b/ports/aws-sdk-cpp/disable_warning_as_error.patch
@ -0,0 +1,13 @@
+diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake
+index 36795a2..77334ee 100644
+--- a/cmake/compiler_settings.cmake
+++ b/cmake/compiler_settings.cmake
+@@ -57,7 +57,7 @@ endif()
+ if(MSVC)
+     # warnings as errors, max warning level (4)
+     if(NOT CMAKE_CXX_FLAGS MATCHES "/WX")
+-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+        #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+     endif()
+ 
+     # taken from http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@ -1,9 +1,9 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aws-sdk-cpp-1.0.47)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aws-sdk-cpp-1.0.61)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/aws/aws-sdk-cpp/archive/1.0.47.tar.gz"
-    FILENAME "aws-sdk-cpp-1.0.47.tar.gz"
-    SHA512 ce7471bafe2763f1c382eed8afeaf6422058599a3aa11ae52909da668c45d12827fcd06b9b3ce34e3c2fa33297fd2e09421b8a89833d581efaf62b7108232acf
+    URLS "https://github.com/aws/aws-sdk-cpp/archive/1.0.61.tar.gz"
+    FILENAME "aws-sdk-cpp-1.0.61.tar.gz"
+    SHA512 aef0a85a32db24dc4fba0fc49c2533074580f3df628e787ff0808f03deea5dac42e19b1edc966706784e98cfed17a350c3eff4f222df7cc756065be56d1fc6a6
 )
 vcpkg_extract_source_archive(${ARCHIVE})

@ -11,6 +11,7 @@ vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
    PATCHES 
 		${CMAKE_CURRENT_LIST_DIR}/drop_git.patch
+		${CMAKE_CURRENT_LIST_DIR}/disable_warning_as_error.patch
 )

 if(VCPKG_CRT_LINKAGE STREQUAL static)
@ -21,6 +22,7 @@ endif()

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+	PREFER_NINJA
 	OPTIONS
 		-DENABLE_TESTING=OFF
 		-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}
@ -44,11 +46,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 	file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
 	file(REMOVE ${LIB_FILES} ${DEBUG_LIB_FILES})
 	
-	vcpkg_apply_patches( #define USE_IMPORT_EXPORT in SDKConfig.h
-		SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
-		PATCHES 
-			${CMAKE_CURRENT_LIST_DIR}/shared_define.patch
-	)
+	file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#define USE_IMPORT_EXPORT")
 endif()

 # Handle copyright
--- a/ports/aws-sdk-cpp/shared_define.patch
+++ b/ports/aws-sdk-cpp/shared_define.patch
@ -1,10 +0,0 @@
-diff --git a/aws/core/SDKConfig.h b/aws/core/SDKConfig.h
-index 130c9dd..66b2630 100644
--- a/aws/core/SDKConfig.h
-+++ b/aws/core/SDKConfig.h
-@@ -17,3 +17,4 @@
- 
- #define JSON_USE_EXCEPTION 0
- 
-+#define USE_IMPORT_EXPORT
-\ No newline at end of file
--- a/ports/azure-storage-cpp/CONTROL
+++ b/ports/azure-storage-cpp/CONTROL
@ -1,5 +1,5 @@
 Source: azure-storage-cpp
-Version: 2.6.0
+Version: 3.0.0
 Build-Depends: cpprestsdk
 Description: Microsoft Azure Storage Client SDK for C++
  A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/
--- a/ports/azure-storage-cpp/portfile.cmake
+++ b/ports/azure-storage-cpp/portfile.cmake
@ -1,10 +1,10 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/azure-storage-cpp-2.6.0)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/azure-storage-cpp-3.0.0)

 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Azure/azure-storage-cpp/archive/v2.6.0.tar.gz"
-    FILENAME "azure-storage-cpp/v2.6.0.tar.gz"
-    SHA512 383fc709b04b7a116b553575f27a95b95a66105fe9b96d412fc4f1938e51288f81e49a9578c02993d0bc2a4771265694117b82fd5beaeaf4c32f81eeb8f9be6a
+    URLS "https://github.com/Azure/azure-storage-cpp/archive/v3.0.0.tar.gz"
+    FILENAME "azure-storage-cpp/v3.0.0.tar.gz"
+    SHA512 45d0d7f8cc350a16cff0371cdd442e851912c89061acfec559482e8f79cebafffd8681b32a30b878e329235cd3aaad5d2ff797d1148302e3109cf5111df14b97
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/bond/0001_boost_static_libs.patch
+++ b/ports/bond/0001_boost_static_libs.patch
@ -0,0 +1,23 @@
+diff --git a/cmake/Config.cmake b/cmake/Config.cmake
+index ed225d14..1573c915 100644
+--- a/cmake/Config.cmake
+++ b/cmake/Config.cmake
+@@ -19,7 +19,7 @@ if (MSVC)
+     # disable MSVC warnings
+     add_compile_options (/bigobj /FIbond/core/warning.h /W4 /WX)
+     add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
+-    set (Boost_USE_STATIC_LIBS ON)
+    set (Boost_USE_STATIC_LIBS OFF)
+ endif (MSVC)
+ 
+ if (WIN32)
+@@ -90,9 +90,6 @@ if (DEFINED ENV{APPVEYOR} AND ("$ENV{BOND_BUILD}" STREQUAL "C++"))
+     endif()
+ endif()
+ 
+-# disable Boost auto-linking
+-add_definitions (-DBOOST_ALL_NO_LIB)
+-
+ # VS2015U2 fixed a bug with atomics and emits a warning without this definition.
+ add_definitions (-D_ENABLE_ATOMIC_ALIGNMENT_FIX)
+ 
--- a/ports/bond/0002_omit_rapidjson.patch
+++ b/ports/bond/0002_omit_rapidjson.patch
@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d743da4..92f91103 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -39,7 +39,6 @@ install (DIRECTORY
+     cpp/inc/bond
+     cpp/generated/bond
+     python/inc/bond
+-    thirdparty/rapidjson/include/rapidjson
+     DESTINATION include
+     PATTERN *.cpp EXCLUDE)
+ 
--- a/ports/bond/0003_rename_gbc_during_install.patch
+++ b/ports/bond/0003_rename_gbc_during_install.patch
@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d743da4..72d62c5e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -49,7 +49,14 @@ install (EXPORT bond
+ 
+ # if BOND_GBC_PATH is set we must copy over that gbc to the install location
+ if (BOND_GBC_PATH)
+-    install (FILES
+-        ${BOND_GBC_PATH}
+-        DESTINATION bin)
+  if (WIN32)
+    set(INSTALLED_GBC_NAME gbc.exe)
+  else()
+    set(INSTALLED_GBC_NAME gbc)
+  endif()
+
+  install (
+    FILES ${BOND_GBC_PATH}
+    DESTINATION bin
+    RENAME ${INSTALLED_GBC_NAME})
+ endif()
--- a/ports/bond/CONTROL
+++ b/ports/bond/CONTROL
@ -1,5 +1,5 @@
 Source: bond
 Maintainer: bond@microsoft.com
-Version: 5.0.0-4-g53ea136
+Version: 5.2.0
 Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. <https://github.com/Microsoft/bond>
 Build-Depends: boost, rapidjson
--- a/ports/bond/portfile.cmake
+++ b/ports/bond/portfile.cmake
@ -1,31 +1,51 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
+    set(VCPKG_LIBRARY_LINKAGE static)
 endif()
+
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-53ea13692925bee4ba494ee9de3614f15c09d85d)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-5.2.0)
+
 vcpkg_download_distfile(ARCHIVE
-  URLS "https://github.com/Microsoft/bond/archive/53ea13692925bee4ba494ee9de3614f15c09d85d.zip"
-  FILENAME "bond-5.0.0-4-g53ea136.zip"
-  SHA512  fe39dc211f6b99cba3f2284d78a524305dfb8dcd1f597639c45625df369f96c3321cb6782fef9eb34d34fab69c8da9015024eee34be6d0a76d730729517183da
+  URLS "https://github.com/Microsoft/bond/archive/5.2.0.zip"
+  FILENAME "bond-5.2.0.zip"
+  SHA512  bc533d9e7431d0690b555aa4a42ca947f8025fc388f698c40cfeacf4286892ac5fd86d93df187009d4791e3eae240eb60886947cfe600838c6058274eb4d625c
 )
+vcpkg_download_distfile(GBC_ARCHIVE
+  URLS "https://github.com/Microsoft/bond/releases/download/5.2.0/gbc-5.2.0-amd64.zip"
+  FILENAME "gbc-5.2.0-amd64.zip"
+  SHA512 9413c0035939788724e08ac858bfc3b2ccefbba74ed737b22eca35ec0da576aa2bf8403e606d2ac20b3fbc827933c289630266824613e04b1921b66fef00e132
+)
+
 vcpkg_extract_source_archive(${ARCHIVE})

-# To build Bond, you'll either need to have the Haskell toolchain installed
-# or set the environment variable BOND_GBC_PATH to point to a directory that
-# contains a pre-compiled version of gbc.exe.
-#
-# You can get a pre-compiled version of gbc from the Bond.Compiler NuGet
-# package <http://www.nuget.org/packages/Bond.Compiler/>.
-#
-# For instructions on installing the Haskell toolchain and getting it to
-# work with Bond, see the Bond README
-# <https://github.com/Microsoft/bond/blob/master/README.md#windows>
+# Extract the precompiled gbc
+vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/)
+set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-5.2.0-amd64.exe)
+
+if (NOT EXISTS ${FETCHED_GBC_PATH})
+    message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.")
+endif()
+
+vcpkg_apply_patches(
+  SOURCE_PATH ${SOURCE_PATH}
+  PATCHES
+    # Change Boost_USE_STATIC_LIBS to be compatible with vcpkg's treatment
+    # of Boost
+    ${CMAKE_CURRENT_LIST_DIR}/0001_boost_static_libs.patch
+    # Don't install rapidjson from the (empty) submodule. With vcpkg, we get
+    # rapidjson from vcpkg
+    ${CMAKE_CURRENT_LIST_DIR}/0002_omit_rapidjson.patch
+    # Temporary until this is committed upstream. See
+    # https://github.com/Microsoft/bond/pull/324 for details.
+    ${CMAKE_CURRENT_LIST_DIR}/0003_rename_gbc_during_install.patch
+)

 vcpkg_configure_cmake(
  SOURCE_PATH ${SOURCE_PATH}
  OPTIONS
    -DBOND_LIBRARIES_ONLY=TRUE
+    -DBOND_GBC_PATH=${FETCHED_GBC_PATH}
 )

 vcpkg_install_cmake()
@ -34,11 +54,14 @@ vcpkg_install_cmake()
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bond)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/bond/LICENSE ${CURRENT_PACKAGES_DIR}/share/bond/copyright)

+# Drop a copy of gbc in tools/ so that it can be used
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/gbc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/)
+
 # vcpkg doesn't--as of version 0.0.30--like executables such as gbc.exe in
-# the output. Just delete it for now.
-file(REMOVE
-  ${CURRENT_PACKAGES_DIR}/bin/gbc.exe
-  ${CURRENT_PACKAGES_DIR}/debug/bin/gbc.exe)
+# the output. Just delete the bin/ directories for now.
+file(REMOVE_RECURSE
+  ${CURRENT_PACKAGES_DIR}/bin/
+  ${CURRENT_PACKAGES_DIR}/debug/bin/)

 # There's no way to supress installation of the headers in the debug build,
 # so we just delete them.
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@ -1,4 +1,4 @@
 Source: boost
-Version: 1.62-9
+Version: 1.63-2
 Description: Peer-reviewed portable C++ source libraries
-Build-Depends: zlib
+Build-Depends: zlib, bzip2
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@ -1,22 +1,22 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_1_62_0)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/boost_1_63_0)

 vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://sourceforge.net/projects/boost/files/boost/1.62.0/boost_1_62_0.tar.bz2"
-    FILENAME "boost_1_62_0.tar.bz2"
-    SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be
+    URLS "https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.bz2"
+    FILENAME "boost_1_63_0.tar.bz2"
+    SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})

 # apply boost range hotfix
 vcpkg_download_distfile(DIFF
    URLS "https://github.com/boostorg/range/commit/e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff"
-    FILENAME "boost-range-has_range_interator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff"
+    FILENAME "boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff"
    SHA512 77dad42bfd9bbab2bbddf361d5b7ad3dd6f812f4294c6dd1a677bb4d0191a4fff43bca32fdd4fce05d428562abb6e38afd0fd33ca6a8b5f28481d70cd2f3dd67
 )
 FILE(READ "${DIFF}" content)
 STRING(REGEX REPLACE "include/" "" content "${content}")
-set(DIFF2 ${CURRENT_BUILDTREES_DIR}/src/boost-range-has_range_interator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff.fixed)
+set(DIFF2 ${CURRENT_BUILDTREES_DIR}/src/boost-range-has_range_iterator-hotfix_e7ebe14707130cda7b72e0ae5e93b17157fdb6a2.diff.fixed)
 FILE(WRITE ${DIFF2} "${content}")
 vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF2})

@ -31,16 +31,14 @@ endif()
 message(STATUS "Bootstrapping done")

 set(B2_OPTIONS
-    -sZLIB_BINARY=zlib
    -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
-    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
-    -sNO_BZIP2=1
+    -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}\\include"
    -j$ENV{NUMBER_OF_PROCESSORS}
    --debug-configuration
    --hash
+    -q

    --without-python
-    toolset=msvc
    threading=multi
 )

@ -59,22 +57,55 @@ endif()
 if(TRIPLET_SYSTEM_ARCH MATCHES "x64")
    list(APPEND B2_OPTIONS address-model=64)
 endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    message(WARNING "Combination of VS2017 and UWP is partially supported; using reference Winmd's from VS2015")
+endif()
 if(VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
    list(APPEND B2_OPTIONS windows-api=store)
-    set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR})
+    set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR}/uwp)
+else()
+    set(ENV{BOOST_BUILD_PATH} ${CMAKE_CURRENT_LIST_DIR}/vs2017)
+endif()
+
+if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    list(APPEND B2_OPTIONS toolset=msvc-14.1)
+elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
+    list(APPEND B2_OPTIONS toolset=msvc-14.0)
+else()
+    message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'")
 endif()

 # Add build type specific options
 set(B2_OPTIONS_DBG
-	${B2_OPTIONS}
+    ${B2_OPTIONS}
+    -sZLIB_BINARY=zlibd
    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
-)
-set(B2_OPTIONS_REL
-	${B2_OPTIONS}
-    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
+    -sBZIP2_BINARY=bz2
+    -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\debug\\lib"
 )

-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+set(B2_OPTIONS_REL
+    ${B2_OPTIONS}
+    -sZLIB_BINARY=zlib
+    -sZLIB_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
+    -sBZIP2_BINARY=bz2
+    -sBZIP2_LIBPATH="${CURRENT_INSTALLED_DIR}\\lib"
+)
+
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+    message(FATAL_ERROR "Unable to remove directory: ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\n  Files are likely in use.")
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+    message(FATAL_ERROR "Unable to remove directory: ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\n  Files are likely in use.")
+endif()
+
+if(EXISTS ${CURRENT_PACKAGES_DIR}/debug)
+    message(FATAL_ERROR "Error: directory exists: ${CURRENT_PACKAGES_DIR}/debug\n  The previous package was not fully cleared. This is an internal error.")
+endif()

 message(STATUS "Building ${TARGET_TRIPLET}-rel")
 vcpkg_execute_required_process_repeat(
@ -108,6 +139,11 @@ file(
    DESTINATION ${CURRENT_PACKAGES_DIR}/include
 )

+# Disable Boost auto-link.
+file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
+	"\n#define BOOST_ALL_NO_LIB\n"
+)
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
    file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp
        "\n#define BOOST_ALL_DYN_LINK\n"
@ -118,15 +154,18 @@ file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/
 message(STATUS "Packaging headers done")

 # This function makes the static build lib names match the dynamic build lib names which FindBoost.cmake is looking for by default.
-# It also renames a couple of "libboost" lib files in the dynamic build (for example libboost_exception-vc140-mt-1_62.lib).
+# It also renames a couple of "libboost" lib files in the dynamic build (for example libboost_exception-vc140-mt-1_63.lib).
 function(boost_rename_libs LIBS)
    foreach(LIB ${${LIBS}})
        get_filename_component(OLD_FILENAME ${LIB} NAME)
        get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
        string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
        string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs
+        string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries
        string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
-        if (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
+        if ("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
+            # nothing to do
+        elseif (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
            file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME})
        else()
            file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
@ -143,7 +182,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
        DESTINATION ${CURRENT_PACKAGES_DIR}/bin
        FILES_MATCHING PATTERN "*.dll")
 endif()
-file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/libboost*.lib)
+file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/*.lib)
 boost_rename_libs(RELEASE_LIBS)
 message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")

@ -156,7 +195,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
        FILES_MATCHING PATTERN "*.dll")
 endif()
-file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/libboost*.lib)
+file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib)
 boost_rename_libs(DEBUG_LIBS)
 message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done")

--- a/ports/boost/user-config.jam
+++ b/ports/boost/user-config.jam
@ -1,10 +0,0 @@
-using msvc : 14.0 : :
-<compileflags>"\"/AIC:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\LIB\\store\\references\""
-<linkflags>/appcontainer
-<linkflags>/nodefaultlibs
-<linkflags>WindowsApp.lib
-<variant>release:<linkflags>vcruntime.lib
-<variant>debug:<linkflags>vcruntimed.lib
-<variant>release:<linkflags>ucrt.lib
-<variant>debug:<linkflags>ucrtd.lib
-;
--- a/ports/boost/uwp/user-config.jam
+++ b/ports/boost/uwp/user-config.jam
@ -0,0 +1,23 @@
+using msvc : 14.0 : :
+<setup>echo
+<compileflags>"\"/AIC:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\LIB\\store\\references\""
+<linkflags>/appcontainer
+<linkflags>/nodefaultlibs
+<linkflags>WindowsApp.lib
+<variant>release:<linkflags>vcruntime.lib
+<variant>debug:<linkflags>vcruntimed.lib
+<variant>release:<linkflags>ucrt.lib
+<variant>debug:<linkflags>ucrtd.lib
+;
+
+using msvc : 14.1 : cl.exe :
+<setup>echo
+<compileflags>"\"/AIC:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\LIB\\store\\references\""
+<linkflags>/appcontainer
+<linkflags>/nodefaultlibs
+<linkflags>WindowsApp.lib
+<variant>release:<linkflags>vcruntime.lib
+<variant>debug:<linkflags>vcruntimed.lib
+<variant>release:<linkflags>ucrt.lib
+<variant>debug:<linkflags>ucrtd.lib
+;
--- a/ports/boost/vs2017/user-config.jam
+++ b/ports/boost/vs2017/user-config.jam
@ -0,0 +1,7 @@
+using msvc : 14.0 : cl.exe :
+<setup>echo
+;
+
+using msvc : 14.1 : cl.exe :
+<setup>echo
+;
--- a/ports/bullet3/CONTROL
+++ b/ports/bullet3/CONTROL
@ -1,3 +1,3 @@
 Source: bullet3
-Version: 2.83.7.98d4780
+Version: 2.86.1
 Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
--- a/ports/bullet3/portfile.cmake
+++ b/ports/bullet3/portfile.cmake
@ -1,9 +1,9 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bullet3-98d47809b4273d97ea06c9b2137ada10af581bb9)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bullet3-2.86.1)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/bulletphysics/bullet3/archive/98d47809b4273d97ea06c9b2137ada10af581bb9.zip"
-    FILENAME "bullet3-98d47809b4273d97ea06c9b2137ada10af581bb9.zip"
-    SHA512 eaa3aa5ff124c87f153a9faeabe00955aaa2d87ed5d2297a96e02531eb7fd1286f2b654bd45401690747ca4391dd7c18486f4cbac0da7e835d52874345b9811d
+    URLS "https://github.com/bulletphysics/bullet3/archive/2.86.1.zip"
+    FILENAME "bullet3-2.86.1.zip"
+    SHA512 96c67bed63db4b7d46196cebda57b80543ea37bd19f013adcfe19ee6c2c3319ed007bcd1ebbe345d8c75b7e80588f4a7d85cb6a07e1a5eea759d97ce4d94f972
 )
 vcpkg_extract_source_archive(${ARCHIVE})

@ -32,4 +32,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bullet3)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/bullet3/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/bullet3/copyright)

-vcpkg_copy_pdbs()
+vcpkg_copy_pdbs()
--- a/ports/bzip2/CMakeLists.txt
+++ b/ports/bzip2/CMakeLists.txt
@ -0,0 +1,42 @@
+cmake_minimum_required(VERSION 3.0)
+project(bzip2)
+
+if(CMAKE_BUILD_TYPE STREQUAL Debug)
+    add_definitions(-DBZ_DEBUG) # enable extra assertions
+endif()
+
+set(LIBBZ2_SOURCES
+    blocksort.c
+    huffman.c
+    crctable.c
+    randtable.c
+    compress.c
+    decompress.c
+    bzlib.c)
+
+add_library(libbz2 ${LIBBZ2_SOURCES})
+set_target_properties(libbz2 PROPERTIES ARCHIVE_OUTPUT_NAME bz2) # reqiured for FindBzip2 to work
+if(BUILD_SHARED_LIBS)
+    target_compile_definitions(libbz2 PRIVATE -DBZ_BUILD_DLL)
+endif()
+
+if(MSVC)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+endif()
+
+install(TARGETS libbz2
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib)
+
+if(NOT BZIP2_SKIP_TOOLS)
+    add_executable(bzip2 bzip2.c ${LIBBZ2_SOURCES})
+    add_executable(bzip2recover bzip2recover.c ${LIBBZ2_SOURCES})
+    install(TARGETS bzip2 bzip2recover DESTINATION tools)
+endif()
+
+if(NOT BZIP2_SKIP_HEADERS)
+    install(FILES bzlib.h DESTINATION include)
+endif()
--- a/ports/bzip2/CONTROL
+++ b/ports/bzip2/CONTROL
@ -0,0 +1,3 @@
+Source: bzip2
+Version: 1.0.6
+Description: High-quality data compressor.
--- a/ports/bzip2/auto-define-import-macro.patch
+++ b/ports/bzip2/auto-define-import-macro.patch
@ -0,0 +1,13 @@
+diff --git a/bzlib.h b/bzlib.h
+index e3ba1d6..d3bed44 100644
+--- a/bzlib.h
+++ b/bzlib.h
+@@ -26,6 +26,8 @@
+ extern "C" {
+ #endif
+ 
+#define BZ_IMPORT
+
+ #define BZ_RUN               0
+ #define BZ_FLUSH             1
+ #define BZ_FINISH            2
--- a/ports/bzip2/fix-import-export-macros.patch
+++ b/ports/bzip2/fix-import-export-macros.patch
@ -0,0 +1,40 @@
+diff --git a/bzlib.h b/bzlib.h
+index 8277123..84fbd0a 100644
+--- a/bzlib.h
+++ b/bzlib.h
+@@ -65,29 +65,23 @@ typedef
+    } 
+    bz_stream;
+ 
+-
+-#ifndef BZ_IMPORT
+-#define BZ_EXPORT
+-#endif
+-
+ #ifndef BZ_NO_STDIO
+ /* Need a definitition for FILE */
+ #include <stdio.h>
+ #endif
+ 
+ #ifdef _WIN32
+-#   include <windows.h>
+ #   ifdef small
+       /* windows.h define small to char */
+ #      undef small
+ #   endif
+-#   ifdef BZ_EXPORT
+-#   define BZ_API(func) WINAPI func
+-#   define BZ_EXTERN extern
+#   define BZ_API(func) func
+#   if defined(BZ_BUILD_DLL)
+#      define BZ_EXTERN __declspec(dllexport)
+#   elif defined(BZ_IMPORT)
+#      define BZ_EXTERN __declspec(dllimport)
+ #   else
+-   /* import windows dll dynamically */
+-#   define BZ_API(func) (WINAPI * func)
+-#   define BZ_EXTERN
+#      define BZ_EXTERN
+ #   endif
+ #else
+ #   define BZ_API(func) func
--- a/ports/bzip2/portfile.cmake
+++ b/ports/bzip2/portfile.cmake
@ -0,0 +1,35 @@
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bzip2-1.0.6)
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
+    FILENAME "bzip2-1.0.6.tar.gz"
+    SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12)
+    
+vcpkg_extract_source_archive(${ARCHIVE})
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/fix-import-export-macros.patch)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS_DEBUG
+        -DBZIP2_SKIP_HEADERS=ON
+        -DBZIP2_SKIP_TOOLS=ON)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_apply_patches(
+        SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
+        PATCHES
+            ${CMAKE_CURRENT_LIST_DIR}/auto-define-import-macro.patch)
+endif()
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright)
--- a/ports/cairo/CMakeLists_cairo.txt
+++ b/ports/cairo/CMakeLists_cairo.txt
@ -101,6 +101,8 @@ file(GLOB SOURCES
 "cairo-tor-scan-converter.c"
 "cairo-tor22-scan-converter.c"
 "cairo-clip-tor-scan-converter.c"
+"cairo-tag-attributes.c"
+"cairo-tag-stack.c"
 "cairo-toy-font-face.c"
 "cairo-traps.c"
 "cairo-tristrip.c"
@ -127,6 +129,7 @@ file(GLOB SOURCES
 "cairo-type1-subset.c"
 "cairo-type3-glyph-surface.c"
 # pdf
+"cairo-pdf-interchange.c"
 "cairo-pdf-operators.c"
 "cairo-pdf-shading.c"
 "cairo-pdf-surface.c"
@ -140,6 +143,8 @@ file(GLOB SOURCES
 "cairo-svg-surface.c"
 # script surface
 "cairo-script-surface.c"
+# fontconfig + freetype
+"cairo-ft-font.c"
 )

 set(CMAKE_DEBUG_POSTFIX "d")
@ -222,11 +227,36 @@ endif()
 add_library(user32 UNKNOWN IMPORTED)
 set_property(TARGET user32 PROPERTY IMPORTED_LOCATION "${USER32_LIBRARY}")

+# Find dependencies of optional modules
+
+# Find FreeType
+if(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(FREETYPE_SUFFIX d)
+endif()
+find_library(FREETYPE_LIBRARY freetype${FREETYPE_SUFFIX})
+if (FREETYPE_LIBRARY MATCHES NOTFOUND)
+  message(FATAL_ERROR "The freetype library could not be found. Check to ensure that it is properly installed.")
+endif()
+
+# Cairo needs to be told which features of FreeType are availible
+add_definitions(
+    -DHAVE_FT_GLYPHSLOT_EMBOLDEN=1
+    -DHAVE_FT_LIBRARY_SETLCDFILTER=1
+    -DHAVE_FT_GLYPHSLOT_OBLIQUE=1
+    -DHAVE_FT_LOAD_SFNT_TABLE=1
+    -DHAVE_FT_GET_X11_FONT_FORMAT=1)
+
+# Find FontConfig
+find_library(FONTCONFIG_LIBRARY fontconfig)
+if (FONTCONFIG_LIBRARY MATCHES NOTFOUND)
+  message(FATAL_ERROR "The fontconfig library could not be found. Check to ensure that it is properly installed.")
+endif()
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
  add_library(cairo ${SOURCES})
  # cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files
  target_compile_options(cairo PUBLIC "/wd4244" PUBLIC "/wd4146" PUBLIC "/wd4312" PUBLIC "/wd4267" PUBLIC "/wd4996" PUBLIC "/wd4311" PUBLIC "/wd4334" PUBLIC "/wd4101")
-  target_link_libraries(cairo gdi32 msimg32 user32 zlib libpng pixman)
+  target_link_libraries(cairo gdi32 msimg32 user32 zlib libpng pixman ${FREETYPE_LIBRARY} ${FONTCONFIG_LIBRARY})

  install(TARGETS cairo
    RUNTIME DESTINATION bin
@ -238,7 +268,7 @@ elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static)
  target_compile_options(cairo-static PUBLIC "/DCAIRO_WIN32_STATIC_BUILD=1")
  # cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files
  target_compile_options(cairo-static PUBLIC "/wd4244" PUBLIC "/wd4146" PUBLIC "/wd4312" PUBLIC "/wd4267" PUBLIC "/wd4996" PUBLIC "/wd4311" PUBLIC "/wd4334" PUBLIC "/wd4101")
-  target_link_libraries(cairo-static gdi32 msimg32 user32 zlib libpng pixman)
+  target_link_libraries(cairo-static gdi32 msimg32 user32 zlib libpng pixman ${FREETYPE_LIBRARY} ${FONTCONFIG_LIBRARY})

  install(TARGETS cairo-static
    RUNTIME DESTINATION bin
@ -248,3 +278,36 @@ elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static)
 else()
  message(FATAL_ERROR "VCPKG_LIBRARY_LINKAGE is not defined or has an unexpected value")
 endif()
+
+# GObject support module
+
+set(CAIRO_GOBJECT_SOURCES
+    "../util/cairo-gobject/cairo-gobject-enums.c"
+    "../util/cairo-gobject/cairo-gobject-structs.c")
+
+# GObject support sources do not include header with export macro
+if(BUILD_SHARED_LIBS)
+    set_source_files_properties(
+        "../util/cairo-gobject/cairo-gobject-enums.c"
+        "../util/cairo-gobject/cairo-gobject-structs.c"
+        PROPERTIES COMPILE_DEFINITIONS cairo_public=__declspec\(dllexport\))
+endif()
+
+# Make GLib's GObject available
+find_library(GLIB_LIBRARY NAMES glib-2.0)
+find_library(GOBJECT_LIBRARY NAMES gobject-2.0)
+set(GLIB_LIBRARIES ${GLIB_LIBRARY} ${GOBJECT_LIBRARY})
+if (GLIB_LIBRARIES MATCHES NOTFOUND)
+  message(FATAL_ERROR "The glib library could not be found. Check to ensure that it is properly installed.")
+endif()
+
+add_library(cairo-gobject ${CAIRO_GOBJECT_SOURCES})
+if(BUILD_SHARED_LIBS)   
+    target_link_libraries(cairo-gobject cairo ${GLIB_LIBRARIES})
+else()
+    target_link_libraries(cairo-gobject cairo-static ${GLIB_LIBRARIES})
+endif()
+install(TARGETS cairo-gobject
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib)
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@ -1,4 +1,4 @@
 Source: cairo
-Version: 1.14.6
+Version: 1.15.4
 Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
-Build-Depends: zlib, libpng, pixman
+Build-Depends: zlib, libpng, pixman, glib, freetype, fontconfig
--- a/ports/cairo/cairo-features.h
+++ b/ports/cairo/cairo-features.h
@ -24,4 +24,13 @@
 #define CAIRO_HAS_OBSERVER_SURFACE 1
 #define CAIRO_HAS_USER_FONT 1

+/* Require GObject */
+#define CAIRO_HAS_GOBJECT_FUNCTIONS 1
+
+/* Require FreeType */
+#define CAIRO_HAS_FT_FONT 1
+
+/* Require FontConfig */
+#define CAIRO_HAS_FC_FONT 1
+
 #endif
--- a/ports/cairo/portfile.cmake
+++ b/ports/cairo/portfile.cmake
@ -7,11 +7,11 @@
 #

 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cairo-1.14.6)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cairo-1.15.4)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.cairographics.org/releases/cairo-1.14.6.tar.xz"
-    FILENAME "cairo-1.14.6.tar.xz"
-    SHA512 e2aa17a33b95b68d407b53ac321cca15b0c148eb49b8639c75b2af1e75e7b417a2168ea978dabb8581b341f0f45dc042d3b1a56b01ab525b1984015f0865316b
+    URLS "http://cairographics.org/snapshots/cairo-1.15.4.tar.xz"
+    FILENAME "cairo-1.15.4.tar.xz"
+    SHA512 ac3e6879fcf0876bca9f801cdf9e970ef1822644228cdd21962d0bf5db5fc074973f4ae651eb9c76b44fffd405cf0a0c7cbb228dba96b835ea137a2740277ee9
 )
 vcpkg_extract_source_archive(${ARCHIVE})

@ -43,6 +43,8 @@ file(COPY
 "${SOURCE_PATH}/src/cairo-svg.h"
 "${SOURCE_PATH}/cairo-version.h"
 "${SOURCE_PATH}/src/cairo-win32.h"
+"${SOURCE_PATH}/util/cairo-gobject/cairo-gobject.h"
+"${SOURCE_PATH}/src/cairo-ft.h"
 DESTINATION
 ${CURRENT_PACKAGES_DIR}/include
 )
--- a/ports/catch/CONTROL
+++ b/ports/catch/CONTROL
@ -1,3 +1,3 @@
 Source: catch
-Version: 1.5.7
+Version: 1.8.1
 Description: C++ Automated Test Cases in Headers 
--- a/ports/catch/portfile.cmake
+++ b/ports/catch/portfile.cmake
@ -10,9 +10,9 @@
 include(vcpkg_common_functions)

 vcpkg_download_distfile(HEADER
-    URLS "https://raw.githubusercontent.com/philsquared/Catch/e27c4ee04282f60aefcc9b1062a74f92cf6c1a2b/single_include/catch.hpp"
+    URLS "https://github.com/philsquared/Catch/releases/download/v1.8.1/catch.hpp"
    FILENAME "catch.hpp"
-    SHA512 c2fec38227bb1725c30f955583dbd012f86eef83512a0c154e91b77249df372db067710ae110463eb07adec722d214114fd6a2cebff7ee43c5fd567a6a1ba221
+    SHA512 942acee9ac54d170a79f4624ce62bc5d9327a863f5565352eb71f2c028d35c2042bf0416530cb8288b27ed78a46d0d02dfaba47e1d79ae9b394943771543ea3f
 )

 vcpkg_download_distfile(LICENSE
--- a/ports/cereal/CONTROL
+++ b/ports/cereal/CONTROL
@ -0,0 +1,3 @@
+Source: cereal
+Version: 1.2.1
+Description: a header-only C++11 serialization library (built in support for binary, XML and JSon)
--- a/ports/cereal/portfile.cmake
+++ b/ports/cereal/portfile.cmake
@ -0,0 +1,16 @@
+#header-only library
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cereal-1.2.1)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/USCiLab/cereal/archive/v1.2.1.tar.gz"
+    FILENAME "cereal-1.2.1.tar.gz"
+    SHA512 f0050f27433a4b544e7785aa94fc7b14a57eed6d542e25d3d0fda4d27cf55ea55e796be2138bf80809c96c392436513fe42764b3a456938395bf7f7177dd1c73
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cereal)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/cereal/LICENSE ${CURRENT_PACKAGES_DIR}/share/cereal/copyright)
+
+# Copy the cereal header files
+file(COPY ${SOURCE_PATH}/include/cereal DESTINATION ${CURRENT_PACKAGES_DIR}/include)
--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@ -1,3 +1,3 @@
 Source: chakracore
-Version: 1.3.1
+Version: 1.4.0
 Description: Core part of the Chakra Javascript engine
--- a/ports/chakracore/disable_warning_as_error.patch
+++ b/ports/chakracore/disable_warning_as_error.patch
@ -0,0 +1,20 @@
+diff --git a/bin/NativeTests/NativeTests.vcxproj b/bin/NativeTests/NativeTests.vcxproj
+index d020992..ac70a65 100644
+--- a/bin/NativeTests/NativeTests.vcxproj
+++ b/bin/NativeTests/NativeTests.vcxproj
+@@ -30,6 +30,15 @@
+       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+       <SmallerTypeCheck>false</SmallerTypeCheck>
+       <MinimalRebuild>false</MinimalRebuild>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">false</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Test|ARM'">false</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatWarningAsError>
+      <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Test|x64'">false</TreatWarningAsError>
+       <!-- <CallingConvention Condition="'$(Platform)'=='Win32'">CDecl</CallingConvention> -->
+     </ClCompile>
+     <Link>
--- a/ports/chakracore/portfile.cmake
+++ b/ports/chakracore/portfile.cmake
@ -4,14 +4,20 @@
 endif()
 include(vcpkg_common_functions)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ChakraCore-1.3.1)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ChakraCore-1.4.1)
 vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://github.com/Microsoft/ChakraCore/archive/v1.3.1.tar.gz"
-    FILENAME "ChakraCore-1.3.1.tar.gz"
-    SHA512 52216a03333e44bce235917cfae5ccd6a756056678d9b81c63ec272d9ce5c6afabc673e7910dd3da54fda7927ea62ede980a4371dbb08f6ce4907121c27dbc53
+    URLS "https://github.com/Microsoft/ChakraCore/archive/v1.4.1.tar.gz"
+    FILENAME "ChakraCore-1.4.1.tar.gz"
+    SHA512 9ca89de88a4d6102826ce4e301ea81b70296cca72131043f9942de715dee2862791c6f33ebce1f12fcafc1554a872a2cf9317313d56c57abff0a6d814a77f2d5
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})

+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES 
+		${CMAKE_CURRENT_LIST_DIR}/disable_warning_as_error.patch
+)
+
 vcpkg_build_msbuild(
    PROJECT_PATH ${SOURCE_PATH}/Build/Chakra.Core.sln
 )
@ -19,6 +25,8 @@ vcpkg_build_msbuild(
 file(INSTALL
 	${SOURCE_PATH}/lib/jsrt/ChakraCore.h
 	${SOURCE_PATH}/lib/jsrt/ChakraCommon.h
+	${SOURCE_PATH}/lib/jsrt/ChakraCommonWindows.h
+	${SOURCE_PATH}/lib/jsrt/ChakraDebug.h
    DESTINATION ${CURRENT_PACKAGES_DIR}/include
 )
 file(INSTALL
@ -39,6 +47,12 @@ file(INSTALL
 	${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib
    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
 )
+file(INSTALL
+	${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe
+	${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe
+	${SOURCE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe
+	DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore)
+vcpkg_copy_pdbs()
 file(INSTALL
 	${SOURCE_PATH}/LICENSE.txt
 	DESTINATION ${CURRENT_PACKAGES_DIR}/share/ChakraCore RENAME copyright)
--- a/ports/clockutils/CONTROL
+++ b/ports/clockutils/CONTROL
@ -1,3 +1,3 @@
 Source: clockutils
-Version: 1.1.1
+Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5
 Description: A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.
--- a/ports/clockutils/portfile.cmake
+++ b/ports/clockutils/portfile.cmake
@ -1,9 +1,10 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/clockUtils-1.1.1)
+set(VERSION 3651f232c27074c4ceead169e223edf5f00247c5)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/clockUtils-${VERSION})
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/ClockworkOrigins/clockUtils/archive/1.1.1.tar.gz"
-    FILENAME "clockUtils-1.1.1.tar.gz"
-    SHA512 6b0c57862baf04c0c5529549ba13983e53445172d9a272571aa20968ba6dba15f1cf480096ca100d450218fef090805366d0564c77a4aa4721a4fe694a0481c9
+    URLS "https://github.com/ClockworkOrigins/clockUtils/archive/${VERSION}.tar.gz"
+    FILENAME "clockUtils-${VERSION}.tar.gz"
+    SHA512 ddb70cae9ced25de77a2df1854dac15e58a77347042ba3ee9c691f85f49edbc6539c84929a7477d429fb9161ba24c57d24d767793b8b1180216d5ddfc5d3ed6a
 )
 vcpkg_extract_source_archive(${ARCHIVE})

@ -33,5 +34,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clockUtils)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/clockUtils/LICENSE ${CURRENT_PACKAGES_DIR}/share/clockUtils/copyright)
 file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE)

 vcpkg_copy_pdbs()
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.9.0-1
-Build-Depends: zlib [windows], openssl [windows], boost [windows]
+Version: 2.9.0-2
+Build-Depends: zlib [windows], openssl [windows], boost [windows], websocketpp [windows]
 Description: C++11 JSON, REST, and OAuth library
  The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@ -15,9 +15,13 @@ vcpkg_apply_patches(
        ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
 )

+SET(WEBSOCKETPP_PATH "${CURRENT_INSTALLED_DIR}/share/websocketpp")
+
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}/Release
    OPTIONS
+        -DWEBSOCKETPP_CONFIG=${WEBSOCKETPP_PATH}
+        -DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH}
        -DBUILD_TESTS=OFF
        -DBUILD_SAMPLES=OFF
        -DCPPREST_EXCLUDE_WEBSOCKETS=OFF
--- a/ports/cppwinrt/CONTROL
+++ b/ports/cppwinrt/CONTROL
@ -1,3 +1,3 @@
 Source: cppwinrt
-Version: 1.010.0.14393.0
+Version: feb2017_refresh-14393
 Description: C++/WinRT is a standard C++ language projection for the Windows Runtime.
--- a/ports/cppwinrt/portfile.cmake
+++ b/ports/cppwinrt/portfile.cmake
@ -1,32 +1,13 @@
-#header-only library
 include(vcpkg_common_functions)
 find_program(GIT git)

-set(GIT_URL "https://github.com/Microsoft/cppwinrt")
-set(GIT_REF "9e01842")
-
-if(NOT EXISTS "${DOWNLOADS}/cppwinrt.git")
-    message(STATUS "Cloning")
-    vcpkg_execute_required_process(
-        COMMAND ${GIT} clone --bare ${GIT_URL} ${DOWNLOADS}/cppwinrt.git
-        WORKING_DIRECTORY ${DOWNLOADS}
-        LOGNAME clone
-    )
-endif()
-message(STATUS "Cloning done")
-
-if(NOT EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git")
-    message(STATUS "Adding worktree")
-    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR})
-    vcpkg_execute_required_process(
-        COMMAND ${GIT} worktree add -f --detach ${CURRENT_BUILDTREES_DIR}/src ${GIT_REF}
-        WORKING_DIRECTORY ${DOWNLOADS}/cppwinrt.git
-        LOGNAME worktree
-    )
-endif()
-message(STATUS "Adding worktree done")
-
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cppwinrt-february_2017_refresh)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/Microsoft/cppwinrt/archive/february_2017_refresh.tar.gz"
+    FILENAME "cppwinrt-february_2017_refresh.tar.gz"
+    SHA512 0e2ed94d65ae4c7297ae4d82d64a43fa59fac7b35fbe42ea939f135f0f6eb867f57fac70b6a9cc9a78912de75aa4482d48007f83a3781b147d237ae637fdaa0e
+)
+vcpkg_extract_source_archive(${ARCHIVE})

 # Put the licence file where vcpkg expects it
 file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppwinrt/license.txt)
--- a/ports/cuda/CONTROL
+++ b/ports/cuda/CONTROL
@ -0,0 +1,3 @@
+Source: cuda
+Version: 8.0
+Description: A parallel computing platform and programming model
--- a/ports/cuda/portfile.cmake
+++ b/ports/cuda/portfile.cmake
@ -0,0 +1,34 @@
+# Due to the complexity involved, this package doesn't install CUDA. It instead verifies that CUDA is installed.
+# Other packages can depend on this package to declare a dependency on CUDA.
+# If this package is installed, we assume that CUDA is properly installed.
+
+execute_process(
+        COMMAND nvcc --version
+        OUTPUT_VARIABLE NVCC_OUTPUT
+        RESULT_VARIABLE error_code)
+
+# Sample output
+# NVIDIA (R) Cuda compiler driver
+# Copyright (c) 2005-2016 NVIDIA Corporation
+# Built on Sat_Sep__3_19:05:48_CDT_2016
+# Cuda compilation tools, release 8.0, V8.0.44
+set(CUDA_REQUIRED_VERSION "V8.0.0")
+
+if (${error_code})
+    message(FATAL_ERROR "CUDA is not installed. Before continuing, please download and install CUDA  (${CUDA_REQUIRED_VERSION} or higher) from:"
+                        "\n    https://developer.nvidia.com/cuda-downloads \n")
+endif()
+
+string(REGEX MATCH "V([0-9]+)\\.([0-9]+)\\.([0-9]+)" CUDA_VERSION ${NVCC_OUTPUT})
+message(STATUS "Found CUDA ${CUDA_VERSION}")
+set(CUDA_VERSION_MAJOR ${CMAKE_MATCH_1})
+#set(CUDA_VERSION_MINOR ${CMAKE_MATCH_2})
+#set(CUDA_VERSION_PATCH ${CMAKE_MATCH_3})
+
+
+if (${CUDA_VERSION_MAJOR} LESS 8)
+    message(FATAL_ERROR "CUDA ${CUDA_VERSION} but ${CUDA_REQUIRED_VERSION} is required. Please download and install a more recent version of CUDA from:"
+                        "\n    https://developer.nvidia.com/cuda-downloads \n")
+endif()
+
+SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
--- a/ports/curl/0002_fix_uwp.patch
+++ b/ports/curl/0002_fix_uwp.patch
@ -0,0 +1,109 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed3f38a..d6480b7 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1010,7 +1010,9 @@ include(CMake/OtherTests.cmake)
+ add_definitions(-DHAVE_CONFIG_H)
+ 
+ # For windows, do not allow the compiler to use default target (Vista).
+-if(WIN32)
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+  add_definitions(-D_WIN32_WINNT=0x0A00 -DHAVE_STRUCT_POLLFD -D_WINSOCK_DEPRECATED_NO_WARNINGS)
+elseif(WIN32)
+   add_definitions(-D_WIN32_WINNT=0x0501)
+ endif(WIN32)
+ 
+diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c
+index 2591fd8..cef38ac 100644
+--- a/lib/curl_gethostname.c
+++ b/lib/curl_gethostname.c
+@@ -21,6 +21,7 @@
+  ***************************************************************************/
+ 
+ #include "curl_setup.h"
+#include "curl/curl.h"
+ 
+ #include "curl_gethostname.h"
+ 
+@@ -64,9 +65,10 @@ int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen) {
+ #ifdef DEBUGBUILD
+ 
+   /* Override host name when environment variable CURL_GETHOSTNAME is set */
+-  const char *force_hostname = getenv("CURL_GETHOSTNAME");
+  char *force_hostname = curl_getenv("CURL_GETHOSTNAME");
+   if(force_hostname) {
+     strncpy(name, force_hostname, namelen);
+    free(force_hostname);
+     err = 0;
+   }
+   else {
+diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
+index 812a073..02c8416 100644
+--- a/lib/curl_ntlm_core.c
+++ b/lib/curl_ntlm_core.c
+@@ -696,9 +696,12 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
+ 
+   /* Calculate the timestamp */
+ #ifdef DEBUGBUILD
+-  char *force_timestamp = getenv("CURL_FORCETIME");
+-  if(force_timestamp)
+  char *force_timestamp = curl_getenv("CURL_FORCETIME");
+  if (force_timestamp)
+  {
+     tw = CURL_OFF_T_C(11644473600) * 10000000;
+    free(force_timestamp);
+  }
+   else
+ #endif
+     tw = ((curl_off_t)time(NULL) + CURL_OFF_T_C(11644473600)) * 10000000;
+diff --git a/lib/ftp.c b/lib/ftp.c
+index b231731..d50779f 100644
+--- a/lib/ftp.c
+++ b/lib/ftp.c
+@@ -3250,7 +3250,7 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status,
+   ssize_t nread;
+   int ftpcode;
+   CURLcode result = CURLE_OK;
+-  char *path;
+  char *path = NULL;
+   const char *path_to_use = data->state.path;
+ 
+   if(!ftp)
+diff --git a/lib/smb.c b/lib/smb.c
+index 7cb0c96..2f43d3c 100644
+--- a/lib/smb.c
+++ b/lib/smb.c
+@@ -32,8 +32,12 @@
+ 
+ #ifdef HAVE_PROCESS_H
+ #include <process.h>
+#if defined(CURL_WINDOWS_APP)
+#define getpid GetCurrentProcessId
+#else
+ #define getpid _getpid
+ #endif
+#endif
+ 
+ #include "smb.h"
+ #include "urldata.h"
+diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
+index 56a8823..5a895ed 100644
+--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
+@@ -197,7 +197,7 @@ unsigned int Curl_rand(struct Curl_easy *data)
+   static bool seeded = FALSE;
+ 
+ #ifdef CURLDEBUG
+-  char *force_entropy = getenv("CURL_ENTROPY");
+  char *force_entropy = curl_getenv("CURL_ENTROPY");
+   if(force_entropy) {
+     if(!seeded) {
+       size_t elen = strlen(force_entropy);
+@@ -208,6 +208,7 @@ unsigned int Curl_rand(struct Curl_easy *data)
+     }
+     else
+       randseed++;
+    free(force_entropy);
+     return randseed;
+   }
+ #endif
--- a/ports/curl/CONTROL
+++ b/ports/curl/CONTROL
@ -1,4 +1,4 @@
 Source: curl
-Version: 7.51.0-2
+Version: 7.51.0-3
 Build-Depends: zlib, openssl, libssh2
 Description: A library for transferring data with URLs
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@ -11,6 +11,7 @@ vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
    PATCHES
        ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
+        ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch
 )

 if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
@ -19,16 +20,34 @@ else()
    SET(CURL_STATICLIB ON)
 endif()

-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS
-        -DBUILD_TESTING=OFF
-        -DBUILD_CURL_EXE=OFF
-        -DENABLE_MANUAL=OFF
-        -DCURL_STATICLIB=${CURL_STATICLIB}
-    OPTIONS_DEBUG
-        -DENABLE_DEBUG=ON
-)
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    vcpkg_configure_cmake(
+        SOURCE_PATH ${SOURCE_PATH}
+        OPTIONS
+            -DBUILD_TESTING=OFF
+            -DBUILD_CURL_EXE=OFF
+            -DENABLE_MANUAL=OFF
+            -DUSE_WIN32_LDAP=OFF
+            -DCURL_DISABLE_TELNET=ON
+            -DENABLE_IPV6=OFF
+            -DENABLE_UNIX_SOCKETS=OFF
+            -DCMAKE_USE_OPENSSL=ON
+            -DCURL_STATICLIB=${CURL_STATICLIB}
+        OPTIONS_DEBUG
+            -DENABLE_DEBUG=ON
+    )
+else()
+    vcpkg_configure_cmake(
+        SOURCE_PATH ${SOURCE_PATH}
+        OPTIONS
+            -DBUILD_TESTING=OFF
+            -DBUILD_CURL_EXE=OFF
+            -DENABLE_MANUAL=OFF
+            -DCURL_STATICLIB=${CURL_STATICLIB}
+        OPTIONS_DEBUG
+            -DENABLE_DEBUG=ON
+    )
+endif()

 vcpkg_install_cmake()

--- a/ports/directxmesh/CONTROL
+++ b/ports/directxmesh/CONTROL
@ -0,0 +1,3 @@
+Source: directxmesh
+Version: oct2016
+Description: DirectXMesh geometry processing library
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@ -0,0 +1,52 @@
+# Common Ambient Variables:
+#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
+#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
+#   PORT is the current port name (zlib, etc)
+#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXMesh-oct2016)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/Microsoft/DirectXMesh/archive/oct2016.tar.gz"
+    FILENAME "DirectXMesh-oct2016.tar.gz"
+    SHA512 8aaf9749766afd23709ce6c6f8d74b008fe9f96789e4d97cb387633dad34b4132ef28dfe028d13c779ea366428d53076a881c0d63c4f0c2c74d552293c8d6bf1
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+    SET(BUILD_ARCH "Win32")
+ELSE()
+    SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+ENDIF()
+
+vcpkg_build_msbuild(
+    PROJECT_PATH ${SOURCE_PATH}/DirectXMesh_Desktop_2015.sln
+    PLATFORM ${BUILD_ARCH}
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/DirectXMesh/DirectXMesh.h
+    ${SOURCE_PATH}/DirectXMesh/DirectXMesh.inl
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+file(INSTALL
+    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DirectXMesh.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(INSTALL
+    ${SOURCE_PATH}/DirectXMesh/Bin/Desktop_2015/${BUILD_ARCH}/Release/DirectXMesh.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+
+set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools)
+file(INSTALL
+    ${SOURCE_PATH}/Meshconvert/Bin/Desktop_2015/${BUILD_ARCH}/Release/Meshconvert.exe
+    DESTINATION ${TOOL_PATH})
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/directxmesh)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/directxmesh/LICENSE ${CURRENT_PACKAGES_DIR}/share/directxmesh/copyright)
--- a/ports/directxtex/CONTROL
+++ b/ports/directxtex/CONTROL
@ -0,0 +1,3 @@
+Source: directxtex
+Version: dec2016
+Description: DirectXTex texture processing library
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@ -0,0 +1,59 @@
+# Common Ambient Variables:
+#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
+#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
+#   PORT is the current port name (zlib, etc)
+#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "Warning: Dynamic building not supported yet. Building static.")
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/directxtex-dec2016)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/Microsoft/DirectXTex/archive/dec2016.tar.gz"
+    FILENAME "directxtex-dec2016.tar.gz"
+    SHA512 87797340c40a98a7b11b6eb7da17d0b93bc01ba48deed50e99ce74e0e33387cac2ec18f2f14d0148c2a79f97ca98d6b2a228dad2f16010b6dcf03c0d24a79d20
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+    SET(BUILD_ARCH "Win32")
+ELSE()
+    SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+ENDIF()
+
+vcpkg_build_msbuild(
+    PROJECT_PATH ${SOURCE_PATH}/DirectXTex_Desktop_2015.sln
+    PLATFORM ${BUILD_ARCH}
+)
+
+file(INSTALL
+    ${SOURCE_PATH}/DirectXTex/DirectXTex.h
+    ${SOURCE_PATH}/DirectXTex/DirectXTex.inl
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+)
+file(INSTALL
+    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DirectXTex.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+file(INSTALL
+    ${SOURCE_PATH}/DirectXTex/Bin/Desktop_2015/${BUILD_ARCH}/Release/DirectXTex.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+
+set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools)
+file(MAKE_DIRECTORY ${TOOL_PATH})
+file(INSTALL
+    ${SOURCE_PATH}/Texdiag/Bin/Desktop_2015/${BUILD_ARCH}/Release/texdiag.exe
+    DESTINATION ${TOOL_PATH})
+file(INSTALL
+    ${SOURCE_PATH}/Texconv/Bin/Desktop_2015/${BUILD_ARCH}/Release/Texconv.exe
+    DESTINATION ${TOOL_PATH})
+file(INSTALL
+    ${SOURCE_PATH}/Texassemble/Bin/Desktop_2015/${BUILD_ARCH}/Release/Texassemble.exe
+    DESTINATION ${TOOL_PATH})
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/DirectXTex)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/DirectXTex/LICENSE ${CURRENT_PACKAGES_DIR}/share/DirectXTex/copyright)
--- a/ports/directxtk/CONTROL
+++ b/ports/directxtk/CONTROL
@ -1,3 +1,3 @@
 Source: directxtk
-Version: oct2016-1
+Version: dec2016-1
 Description: A collection of helper classes for writing DirectX 11.x code in C++.
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@ -4,11 +4,11 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 endif()

 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK-oct2016)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK-dec2016)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/DirectXTK/archive/oct2016.tar.gz"
-    FILENAME "oct2016.tar.gz"
-    SHA512 b44ee28518ca65d38a3c915881ef79533b48b07d3738b616f1935d7c00a26d5e48b2292cde6acc34e933f85ba2a6362c585c60b2bbc704745d43cef53769a112
+    URLS "https://github.com/Microsoft/DirectXTK/archive/dec2016.tar.gz"
+    FILENAME "DirectXTK-dec2016.tar.gz"
+    SHA512 efb8a98d0872bf1835b274ba88615e88c4a58ab753c5ebef5a407c54d5f9a2197d1521f14651c60ea16c047918db6f54bf2ac58a6eb7330490b9bae619e8dad3
 )
 vcpkg_extract_source_archive(${ARCHIVE})

@ -19,16 +19,16 @@ ELSE()
 ENDIF()

 vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/DirectXTK_Desktop_2015_Win10.sln
+    PROJECT_PATH ${SOURCE_PATH}/DirectXTK_Desktop_2015.sln
 	PLATFORM ${BUILD_ARCH}
 )

 file(INSTALL
-	${SOURCE_PATH}/Bin/Desktop_2015_Win10/${BUILD_ARCH}/Release/DirectXTK.lib
+	${SOURCE_PATH}/Bin/Desktop_2015/${BUILD_ARCH}/Release/DirectXTK.lib
 	DESTINATION ${CURRENT_PACKAGES_DIR}/lib)

 file(INSTALL
-	${SOURCE_PATH}/Bin/Desktop_2015_Win10/${BUILD_ARCH}/Debug/DirectXTK.lib
+	${SOURCE_PATH}/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DirectXTK.lib
 	DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)

 set(DXTK_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtk)
--- a/ports/directxtk12/CONTROL
+++ b/ports/directxtk12/CONTROL
@ -1,3 +1,3 @@
 Source: directxtk12
-Version: oct2016
+Version: dec2016
 Description: A collection of helper classes for writing DirectX 12 code in C++.
--- a/ports/directxtk12/portfile.cmake
+++ b/ports/directxtk12/portfile.cmake
@ -4,11 +4,11 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 endif()

 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK12-oct2016)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/DirectXTK12-dec2016)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Microsoft/DirectXTK12/archive/oct2016.tar.gz"
-    FILENAME "DirectXTK12-oct2016.tar.gz"
-    SHA512 f33af80dc018c1fda117eeef66bd08046b48572806d879651187cbed9d5ceb402b1798ecc0e1089b54ddb879e5355b45f2b67e3be99fbe270c5216a945a9924b
+    URLS "https://github.com/Microsoft/DirectXTK12/archive/dec2016.tar.gz"
+    FILENAME "DirectXTK12-dec2016.tar.gz"
+    SHA512 7c98fbf1d7ef96807a38d396a87dacdc60fdcd7e461210d246cc424789c4c5c5fb1390db958c1bd1f77da8af756a9eae36813e5da6bbb0ea1432ff4004f1d010
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/dlib/CONTROL
+++ b/ports/dlib/CONTROL
@ -0,0 +1,3 @@
+Source: dlib
+Version: 19.2
+Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++
--- a/ports/dlib/portfile.cmake
+++ b/ports/dlib/portfile.cmake
@ -0,0 +1,45 @@
+# Common Ambient Variables:
+#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
+#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
+#   PORT is the current port name (zlib, etc)
+#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/dlib-19.2)
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://dlib.net/files/dlib-19.2.tar.bz2"
+    FILENAME "dlib-19.2.tar.bz2"
+    SHA512 dcef5c8be52fe2650c1eccac6c7ac4050075dc07ee504a8bf3df6c9a597da5fdc09506e631abfa979d71c74940ce39ec5267be4c3a676a01ac66fcb14cbfe854
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
+    # OPTIONS_RELEASE -DOPTIMIZE=1
+    # OPTIONS_DEBUG -DDEBUGGABLE=1
+)
+
+vcpkg_install_cmake()
+
+# There is no way to suppress installation of the headers and resource files in debug build.
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/test)
+
+# Remove other files not required in package
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/all)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm)
+
+# Handle copyright
+#file(COPY ${SOURCE_PATH}/docs/license.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/dlib)
+file(COPY ${CURRENT_PACKAGES_DIR}/share/doc/dlib/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/dlib)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/dlib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/dlib/COPYRIGHT)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
--- a/ports/dx/CONTROL
+++ b/ports/dx/CONTROL
@ -0,0 +1,3 @@
+Source: dx
+Version: 1.0.1
+Description: A modern C++ library for DirectX programming
--- a/ports/dx/portfile.cmake
+++ b/ports/dx/portfile.cmake
@ -0,0 +1,20 @@
+#header-only library
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/dx-1.0.1)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/sdcb/dx/archive/v1.0.1.tar.gz"
+    FILENAME "dx-1.0.1.tar.gz"
+    SHA512 b40eb4daf774bfdb394b207bb29652fbf44361f5d8f9b60509c7a3215cd403dbf0c10454979c0c2e97d839496ef20940070a42837375993cd67d58afacc990e0
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+file(INSTALL
+	${SOURCE_PATH}/dx.h
+	${SOURCE_PATH}/debug.h
+	${SOURCE_PATH}/handle.h
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include/dx
+)
+
+file(INSTALL
+	${SOURCE_PATH}/LICENSE
+	DESTINATION ${CURRENT_PACKAGES_DIR}/share/dx RENAME copyright)
--- a/ports/eigen3/portfile.cmake
+++ b/ports/eigen3/portfile.cmake
@ -1,10 +1,10 @@
 #header-only library
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eigen-eigen-26667be4f70b)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eigen-eigen-67e894c6cd8f)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://bitbucket.org/eigen/eigen/get/3.3.0.tar.bz2"
-    FILENAME "eigen-3.3.0.tar.bz2"
-    SHA512 a1919accc9fcf64eca17b3e60a78eefeb1a187c261c28b8480604f36cf366cd6323e966d6b948f8a4ce0ae3213a3815bccd34661d1d8fb33315def4304bf163e
+    URLS "http://bitbucket.org/eigen/eigen/get/3.3.3.tar.bz2"
+    FILENAME "eigen-3.3.3.tar.bz2"
+    SHA512 bb5a8b761371e516f0a344a7c9f6e369e21c2907c8548227933ca6010fc607a66c8d6ff7c41b1aec3dea7d482ce8c2a09e38ae5c7a2c5b16bdd8007e7a81ecc3
 )
 vcpkg_extract_source_archive(${ARCHIVE})

--- a/ports/ffmpeg/CONTROL
+++ b/ports/ffmpeg/CONTROL
@ -0,0 +1,4 @@
+Source: ffmpeg
+Version: 3.2.4-2
+Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
+  FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
--- a/ports/ffmpeg/build.sh
+++ b/ports/ffmpeg/build.sh
@ -0,0 +1,17 @@
+#!/usr/bin/bash
+set -e
+export PATH=/usr/bin:$PATH
+pacman -Sy --noconfirm --needed diffutils make
+
+PATH_TO_BUILD_DIR="`cygpath "$1"`"
+PATH_TO_SRC_DIR="`cygpath "$2"`"
+PATH_TO_PACKAGE_DIR="`cygpath "$3"`"
+# Note: $4 is extra configure options
+
+cd "$PATH_TO_BUILD_DIR"
+echo "=== CONFIGURING ==="
+"$PATH_TO_SRC_DIR/configure" --toolchain=msvc "--prefix=$PATH_TO_PACKAGE_DIR" $4
+echo "=== BUILDING ==="
+make -j6
+echo "=== INSTALLING ==="
+make install
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@ -0,0 +1,105 @@
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    message(STATUS "Building as static libraries not currently supported. Building as DLLs instead.")
+    set(VCPKG_LIBRARY_LINKAGE "dynamic")
+endif()
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ffmpeg-3.2.4)
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://ffmpeg.org/releases/ffmpeg-3.2.4.tar.bz2"
+    FILENAME "ffmpeg-3.2.4.tar.bz2"
+    SHA512 ba5004d0f2659faa139c7dbf2f0fc6bab1d4e017d919f4ac271a5d2e8e4a3478909176e3a4d1ad33ddf2f62ab28dd9e00ce9be1399efb7cb3276dde79134cdaa
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_find_acquire_program(YASM)
+get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
+set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")
+
+vcpkg_acquire_msys(MSYS_ROOT)
+set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
+
+set(_csc_PROJECT_PATH ffmpeg)
+
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+
+set(OPTIONS "--disable-ffmpeg --disable-ffprobe --disable-doc --enable-debug")
+set(OPTIONS "${OPTIONS} --enable-runtime-cpudetect")
+set(OPTIONS_DEBUG "") # Note: --disable-optimizations can't be used due to http://ffmpeg.org/pipermail/libav-user/2013-March/003945.html
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    set(OPTIONS "${OPTIONS} --disable-static --enable-shared")
+endif()
+
+if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+    set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MDd --extra-cxxflags=-MDd --extra-ldflags=-NODEFAULTLIB:libcmt")
+else()
+    set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MTd --extra-cxxflags=-MTd --extra-ldflags=-NODEFAULTLIB:libcmt")
+endif()
+
+message(STATUS "Building ${_csc_PROJECT_PATH} for Release")
+file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
+vcpkg_execute_required_process(
+    COMMAND ${BASH} --noprofile --norc "${CMAKE_CURRENT_LIST_DIR}\\build.sh"
+        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" # BUILD DIR
+        "${SOURCE_PATH}" # SOURCE DIR
+        "${CURRENT_PACKAGES_DIR}" # PACKAGE DIR
+        "${OPTIONS}"
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
+    LOGNAME build-${TARGET_TRIPLET}-rel
+)
+
+message(STATUS "Building ${_csc_PROJECT_PATH} for Debug")
+file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
+vcpkg_execute_required_process(
+    COMMAND ${BASH} --noprofile --norc "${CMAKE_CURRENT_LIST_DIR}\\build.sh"
+        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" # BUILD DIR
+        "${SOURCE_PATH}" # SOURCE DIR
+        "${CURRENT_PACKAGES_DIR}/debug" # PACKAGE DIR
+        "${OPTIONS} ${OPTIONS_DEBUG}"
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
+    LOGNAME build-${TARGET_TRIPLET}-dbg
+)
+
+file(GLOB DEF_FILES ${CURRENT_PACKAGES_DIR}/lib/*.def ${CURRENT_PACKAGES_DIR}/debug/lib/*.def)
+
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+    set(LIB_MACHINE_ARG /machine:ARM)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(LIB_MACHINE_ARG /machine:x86)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    set(LIB_MACHINE_ARG /machine:x64)
+else()
+    message(FATAL_ERROR "Unsupported target architecture")
+endif()
+
+foreach(DEF_FILE ${DEF_FILES})
+    get_filename_component(DEF_FILE_DIR "${DEF_FILE}" DIRECTORY)
+    get_filename_component(DEF_FILE_NAME "${DEF_FILE}" NAME)
+    string(REGEX REPLACE "-[0-9]*\\.def" ".lib" OUT_FILE_NAME "${DEF_FILE_NAME}")
+    file(TO_NATIVE_PATH "${DEF_FILE}" DEF_FILE_NATIVE)
+    file(TO_NATIVE_PATH "${DEF_FILE_DIR}/${OUT_FILE_NAME}" OUT_FILE_NATIVE)
+    message(STATUS "Generating ${OUT_FILE_NATIVE}")
+    vcpkg_execute_required_process(
+        COMMAND lib.exe /def:${DEF_FILE_NATIVE} /out:${OUT_FILE_NATIVE} ${LIB_MACHINE_ARG}
+        WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}
+        LOGNAME libconvert-${TARGET_TRIPLET}
+    )
+endforeach()
+
+file(GLOB EXP_FILES ${CURRENT_PACKAGES_DIR}/lib/*.exp ${CURRENT_PACKAGES_DIR}/debug/lib/*.exp)
+file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib)
+file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+set(FILES_TO_REMOVE ${EXP_FILES} ${LIB_FILES} ${DEF_FILES} ${EXE_FILES})
+list(LENGTH FILES_TO_REMOVE FILES_TO_REMOVE_LEN)
+if(FILES_TO_REMOVE_LEN GREATER 0)
+    file(REMOVE ${FILES_TO_REMOVE})
+endif()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+# TODO: Examine build log and confirm that this license matches the build output
+file(COPY ${SOURCE_PATH}/COPYING.LGPLv2.1 DESTINATION ${CURRENT_PACKAGES_DIR}/share/ffmpeg)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/ffmpeg/COPYING.LGPLv2.1 ${CURRENT_PACKAGES_DIR}/share/ffmpeg/copyright)
--- a/ports/fftw3/CMakeLists.txt
+++ b/ports/fftw3/CMakeLists.txt
@ -0,0 +1,96 @@
+cmake_minimum_required (VERSION 3.0)
+project (fftw3)
+
+# From: http://stackoverflow.com/questions/10252336/fftw-in-visual-studio-2010
+
+# Standard:          /DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR
+if (WIN32)
+    add_definitions(-D_OPENMP -DLIBFFTWF33_EXPORTS /openmp /bigobj) # Visual Studio 2005 and up supports OpenMP
+endif (WIN32)
+
+if (BUILD_SHARED_LIBS)
+    add_definitions(-DFFTW_DLL)
+endif()
+
+
+file(GLOB           fftw_api_SOURCE                 api/*.c             api/*.h)
+file(GLOB           fftw_dft_SOURCE                 dft/*.c             dft/*.h)
+file(GLOB           fftw_dft_scalar_SOURCE          dft/scalar/*.c      dft/scalar/*.h)
+file(GLOB           fftw_dft_scalar_codelets_SOURCE dft/scalar/codelets/*.c     dft/scalar/codelets/*.h)
+file(GLOB           fftw_dft_simd_SOURCE            dft/simd/*.c        dft/simd/*.h)
+
+file(GLOB           fftw_dft_simd_sse2_SOURCE       dft/simd/sse2/*.c   dft/simd/sse2/*.h)
+file(GLOB           fftw_kernel_SOURCE              kernel/*.c          kernel/*.h)
+file(GLOB           fftw_rdft_SOURCE                rdft/*.c            rdft/*.h)
+file(GLOB           fftw_rdft_scalar_SOURCE         rdft/scalar/*.c     rdft/scalar/*.h)
+
+file(GLOB           fftw_rdft_scalar_r2cb_SOURCE    rdft/scalar/r2cb/*.c
+                                                    rdft/scalar/r2cb/*.h)
+file(GLOB           fftw_rdft_scalar_r2cf_SOURCE    rdft/scalar/r2cf/*.c
+                                                    rdft/scalar/r2cf/*.h)
+file(GLOB           fftw_rdft_scalar_r2r_SOURCE     rdft/scalar/r2r/*.c
+                                                    rdft/scalar/r2r/*.h)
+
+file(GLOB           fftw_rdft_simd_SOURCE           rdft/simd/*.c       rdft/simd/*.h)
+file(GLOB           fftw_rdft_simd_sse2_SOURCE      rdft/simd/sse2/*.c  rdft/simd/sse2/*.h)
+
+file(GLOB           fftw_reodft_SOURCE              reodft/*.c          reodft/*.h)
+file(GLOB           fftw_simd_support_SOURCE        simd-support/*.c    simd-support/*.h)
+#file(GLOB          fftw_threads_SOURCE             threads/*.c         threads/*.h)
+
+
+set(${fftw_threads_SOURCE}
+    threads/api.c
+    threads/conf.c
+    threads/ct.c
+    threads/dft-vrank-qeq1.c
+    threads/f77api.c
+    threads/hc2hc.c
+    threads/openmp.c
+    threads/rdft-vrank-geq1.c
+    threads/vrank-geq1-rdft2.c)
+
+
+include_directories(
+    kernel
+    api
+    dft
+    dft/scalar
+    dft/scalar/codelets # really needed?
+    dft/simd
+    dft/simd/sse2
+    rdft
+    rdft/scalar
+    rdft/simd
+    reodft
+    ${CMAKE_CURRENT_SOURCE_DIR} # thats where the config.h is located
+    simd-support
+)
+
+# Create a target for the library
+add_library(fftw3
+    ${fftw_api_SOURCE}
+    ${fftw_dft_SOURCE}
+    ${fftw_dft_scalar_SOURCE}
+    ${fftw_dft_scalar_codelets_SOURCE}
+    ${fftw_dft_simd_SOURCE}
+    ${fftw_dft_simd_sse2_SOURCE}
+    ${fftw_kernel_SOURCE}
+    ${fftw_rdft_SOURCE}
+    ${fftw_rdft_scalar_SOURCE}
+
+    ${fftw_rdft_scalar_r2cb_SOURCE}
+    ${fftw_rdft_scalar_r2cf_SOURCE}
+    ${fftw_rdft_scalar_r2r_SOURCE}
+
+    ${fftw_rdft_simd_SOURCE}
+    ${fftw_rdft_simd_sse2_SOURCE}
+    ${fftw_reodft_SOURCE}
+    ${fftw_simd_support_SOURCE}
+    ${fftw_threads_SOURCE}
+)
+
+install(TARGETS fftw3
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib)
--- a/ports/fftw3/CONTROL
+++ b/ports/fftw3/CONTROL
@ -0,0 +1,3 @@
+Source: fftw3
+Version: 3.3.6-p11
+Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).
--- a/ports/fftw3/config.h
+++ b/ports/fftw3/config.h
@ -0,0 +1,393 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to compile in long-double precision. */
+#undef BENCHFFT_LDOUBLE
+
+/* Define to compile in quad precision. */
+#undef BENCHFFT_QUAD
+
+/* Define to compile in single precision. */
+#undef BENCHFFT_SINGLE
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
+/* Define to disable Fortran wrappers. */
+#define DISABLE_FORTRAN 1
+
+/* Define to dummy `main' function (if any) required to link to the Fortran
+   libraries. */
+#undef F77_DUMMY_MAIN
+
+/* Define to a macro mangling the given C identifier (in lower and upper
+   case), which must not contain underscores, for linking with Fortran. */
+#undef F77_FUNC
+
+/* As F77_FUNC, but for C identifiers containing underscores. */
+#undef F77_FUNC_
+
+/* Define if F77_FUNC and F77_FUNC_ are equivalent. */
+#undef F77_FUNC_EQUIV
+
+/* Define if F77 and FC dummy `main' functions are identical. */
+#undef FC_DUMMY_MAIN_EQ_F77
+
+/* C compiler name and flags */
+#define FFTW_CC "cl"
+
+/* Define to enable extra FFTW debugging code. */
+#undef FFTW_DEBUG
+
+/* Define to enable alignment debugging hacks. */
+#undef FFTW_DEBUG_ALIGNMENT
+
+/* Define to enable debugging malloc. */
+#undef FFTW_DEBUG_MALLOC
+
+/* Define to enable the use of alloca(). */
+#undef FFTW_ENABLE_ALLOCA
+
+/* Define to compile in long-double precision. */
+#undef FFTW_LDOUBLE
+
+/* Define to compile in quad precision. */
+#undef FFTW_QUAD
+
+/* Define to enable pseudorandom estimate planning for debugging. */
+#undef FFTW_RANDOM_ESTIMATOR
+
+/* Define to compile in single precision. */
+#undef FFTW_SINGLE
+
+/* Define to 1 if you have the `abort' function. */
+#define HAVE_ABORT 1
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#undef HAVE_ALLOCA
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+#undef HAVE_ALLOCA_H
+
+/* Define to enable Altivec optimizations. */
+#undef HAVE_ALTIVEC
+
+/* Define to 1 if you have the <altivec.h> header file. */
+#undef HAVE_ALTIVEC_H
+
+/* Define to enable AVX optimizations. */
+#undef HAVE_AVX
+
+/* Define to 1 if you have the `BSDgettimeofday' function. */
+#undef HAVE_BSDGETTIMEOFDAY
+
+/* Define to 1 if you have the `clock_gettime' function. */
+#undef HAVE_CLOCK_GETTIME
+
+/* Define to 1 if you have the `cosl' function. */
+#define HAVE_COSL 1
+
+/* Define to 1 if you have the <c_asm.h> header file. */
+#undef HAVE_C_ASM_H
+
+/* Define to 1 if you have the declaration of `cosl', and to 0 if you don't.
+   */
+#define HAVE_DECL_COSL 1
+
+/* Define to 1 if you have the declaration of `cosq', and to 0 if you don't. */
+#define HAVE_DECL_COSQ 0
+
+/* Define to 1 if you have the declaration of `drand48', and to 0 if you don't. */
+#define HAVE_DECL_DRAND48 0
+
+/* Define to 1 if you have the declaration of `memalign', and to 0 if you don't. */
+#define HAVE_DECL_MEMALIGN 0
+
+/* Define to 1 if you have the declaration of `posix_memalign', and to 0 if you don't. */
+#define HAVE_DECL_POSIX_MEMALIGN 0
+
+/* Define to 1 if you have the declaration of `sinl', and to 0 if you don't. */
+#define HAVE_DECL_SINL 1
+
+/* Define to 1 if you have the declaration of `sinq', and to 0 if you don't.
+   */
+#define HAVE_DECL_SINQ 0
+
+/* Define to 1 if you have the declaration of `srand48', and to 0 if you
+   don't. */
+#define HAVE_DECL_SRAND48 0
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+#undef HAVE_DOPRNT
+
+/* Define to 1 if you have the `drand48' function. */
+#undef HAVE_DRAND48
+
+/* Define if you have a machine with fused multiply-add */
+#undef HAVE_FMA
+
+/* Define to 1 if you have the `gethrtime' function. */
+#undef HAVE_GETHRTIME
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
+/* Define to 1 if hrtime_t is defined in <sys/time.h> */
+#undef HAVE_HRTIME_T
+
+/* Define to 1 if you have the <intrinsics.h> header file. */
+#undef HAVE_INTRINSICS_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if the isnan() function/macro is available. */
+#undef HAVE_ISNAN
+
+/* Define to 1 if you have the <libintl.h> header file. */
+#undef HAVE_LIBINTL_H
+
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
+/* Define to 1 if you have the `quadmath' library (-lquadmath). */
+#undef HAVE_LIBQUADMATH
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if the compiler supports `long double' */
+#define HAVE_LONG_DOUBLE 1
+
+/* Define to 1 if you have the `mach_absolute_time' function. */
+#undef HAVE_MACH_ABSOLUTE_TIME
+
+/* Define to 1 if you have the <mach/mach_time.h> header file. */
+#undef HAVE_MACH_MACH_TIME_H
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define to 1 if you have the `memalign' function. */
+#undef HAVE_MEMALIGN
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to enable MIPS paired-single optimizations. */
+#undef HAVE_MIPS_PS
+
+/* Define to enable use of MIPS ZBus cycle-counter. */
+#undef HAVE_MIPS_ZBUS_TIMER
+
+/* Define if you have the MPI library. */
+#undef HAVE_MPI
+
+/* Define if OpenMP is enabled */
+#define HAVE_OPENMP 1
+
+/* Define to 1 if you have the `posix_memalign' function. */
+#undef HAVE_POSIX_MEMALIGN
+
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
+/* Define to 1 if you have the `read_real_time' function. */
+#undef HAVE_READ_REAL_TIME
+
+/* Define to 1 if you have the `sinl' function. */
+#define HAVE_SINL 1
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* Define to 1 if you have the `sqrt' function. */
+#define HAVE_SQRT 1
+
+/* Define to enable SSE/SSE2 optimizations. */
+#define HAVE_SSE2 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `sysctl' function. */
+#undef HAVE_SYSCTL
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#undef HAVE_SYS_SYSCTL_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the `tanl' function. */
+#define HAVE_TANL 1
+
+/* Define if we have a threads library. */
+#undef HAVE_THREADS
+
+/* Define to 1 if you have the `time_base_to_time' function. */
+#undef HAVE_TIME_BASE_TO_TIME
+
+/* Define to 1 if the system has the type `uintptr_t'. */
+#define HAVE_UINTPTR_T 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if you have the `_mm_free' function. */
+#undef HAVE__MM_FREE
+
+/* Define to 1 if you have the `_mm_malloc' function. */
+#undef HAVE__MM_MALLOC
+
+/* Define if you have the UNICOS _rtc() intrinsic. */
+#undef HAVE__RTC
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Name of package */
+#define PACKAGE "fftw"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "fftw@fftw.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "fftw"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "fftw-3.3"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "fftw"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "http://www.fftw.org"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "3.3"
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
+/* The size of `double', as computed by sizeof. */
+#undef SIZEOF_DOUBLE
+
+/* The size of `fftw_r2r_kind', as computed by sizeof. */
+#undef SIZEOF_FFTW_R2R_KIND
+
+/* The size of `float', as computed by sizeof. */
+#undef SIZEOF_FLOAT
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
+/* The size of `MPI_Fint', as computed by sizeof. */
+#undef SIZEOF_MPI_FINT
+
+/* The size of `ptrdiff_t', as computed by sizeof. */
+#undef SIZEOF_PTRDIFF_T
+
+/* The size of `size_t', as computed by sizeof. */
+#undef SIZEOF_SIZE_T
+
+/* The size of `unsigned int', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_INT
+
+/* The size of `unsigned long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG
+
+/* The size of `unsigned long long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG_LONG
+
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Define if we have and are using POSIX threads. */
+#undef USING_POSIX_THREADS
+
+/* Version number of package */
+#define VERSION "3.3"
+
+/* Use common Windows Fortran mangling styles for the Fortran interfaces. */
+#undef WINDOWS_F77_MANGLING
+
+/* Include g77-compatible wrappers in addition to any other Fortran wrappers.
+   */
+#undef WITH_G77_WRAPPERS
+
+/* Use our own aligned malloc routine; mainly helpful for Windows systems
+   lacking aligned allocation system-library routines. */
+#define WITH_OUR_MALLOC 1
+
+/* Use low-precision timers, making planner very slow */
+#undef WITH_SLOW_TIMER
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#define inline __inline
+#endif
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
--- a/ports/fftw3/fix-dynamic.patch
+++ b/ports/fftw3/fix-dynamic.patch
@ -0,0 +1,11 @@
+--- a/fftw3.h	2017-01-15 13:03:24.000000000 +0100
+++ b/fftw3.h	2017-02-24 04:05:36.051091700 +0100
+@@ -47,6 +47,8 @@
+ #ifndef FFTW3_H
+ #define FFTW3_H
+ 
+#define FFTW_DLL
+
+ #include <stdio.h>
+ 
+ #ifdef __cplusplus
--- a/ports/fftw3/portfile.cmake
+++ b/ports/fftw3/portfile.cmake
@ -0,0 +1,41 @@
+# Common Ambient Variables:
+#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
+#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
+#   PORT is the current port name (zlib, etc)
+#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fftw-3.3.6-pl1)
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://www.fftw.org/fftw-3.3.6-pl1.tar.gz"
+    FILENAME "fftw-3.3.6-pl1.tar.gz"
+    SHA512 e2ed33fcb068a36a841bbd898d12ceec74f4e9a0a349e7c55959878b50224a69a0f87656347dad7d7e1448ebc50d28d8f34f6da7992c43072d26942fd97c0134
+)
+
+vcpkg_extract_source_archive(${ARCHIVE})
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(COPY ${SOURCE_PATH}/api/fftw3.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
+    vcpkg_apply_patches(
+            SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
+            PATCHES
+                    ${CMAKE_CURRENT_LIST_DIR}/fix-dynamic.patch)
+endif()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fftw3)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/fftw3/COPYING ${CURRENT_PACKAGES_DIR}/share/fftw3/copyright)
--- a/ports/flatbuffers/CONTROL
+++ b/ports/flatbuffers/CONTROL
@ -0,0 +1,4 @@
+Source: flatbuffers
+Version: 1.6.0
+Description: Memory Efficient Serialization Library http://google.github.io/flatbuffers/
+  FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility.
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@ -0,0 +1,62 @@
+# Common Ambient Variables:
+#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
+#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
+#   PORT is the current port name (zlib, etc)
+#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    message("Building DLLs not supported. Building static instead.")
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flatbuffers-1.6.0)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/google/flatbuffers/archive/v1.6.0.zip"
+    FILENAME "flatbuffers-1.6.0.zip"
+    SHA512 c23043a54d7055f4e0a0164fdafd3f1d60292e57d62d20d30f641c9da90935d14da847f86239a19f777e68b707cfb25452da9192607a3a399ab25ce06b31c282
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+set(OPTIONS)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    list(APPEND OPTIONS -DFLATBUFFERS_BUILD_SHAREDLIB=ON)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS
+        -DFLATBUFFERS_BUILD_TESTS=OFF
+        -DFLATBUFFERS_BUILD_GRPCTEST=OFF
+        ${OPTIONS}
+    # OPTIONS_RELEASE -DOPTIMIZE=1
+    # OPTIONS_DEBUG -DDEBUGGABLE=1
+)
+
+vcpkg_install_cmake()
+
+if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/flatc.exe)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/flatc.exe ${CURRENT_PACKAGES_DIR}/tools/flatc.exe)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+endif()
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/flatbuffers.dll)
+    make_directory(${CURRENT_PACKAGES_DIR}/bin)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/flatbuffers.dll ${CURRENT_PACKAGES_DIR}/bin/flatbuffers.dll)
+endif()
+if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/flatbuffers.dll)
+    make_directory(${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/flatbuffers.dll ${CURRENT_PACKAGES_DIR}/debug/bin/flatbuffers.dll)
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/flatbuffers)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/flatbuffers/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/flatbuffers/copyright)
--- a/ports/fltk/CONTROL
+++ b/ports/fltk/CONTROL
@ -0,0 +1,4 @@
+Source: fltk
+Version: 1.3.4-2
+Description: FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.
+Build-Depends: zlib, libpng, libjpeg-turbo
--- a/ports/fltk/findlibsfix.patch
+++ b/ports/fltk/findlibsfix.patch
@ -0,0 +1,51 @@
+diff --git a/CMake/resources.cmake b/CMake/resources.cmake
+index 37c0c08..b1f52d1 100644
+--- a/CMake/resources.cmake
+++ b/CMake/resources.cmake
+@@ -26,10 +26,10 @@ find_file(HAVE_DLFCN_H dlfcn.h)
+ find_file(HAVE_FREETYPE_H freetype.h PATH_SUFFIXES freetype2 freetype2/freetype)
+ find_file(HAVE_GL_GL_H GL/gl.h)
+ find_file(HAVE_GL_GLU_H GL/glu.h)
+-find_file(HAVE_LIBPNG_PNG_H libpng/png.h)
+#find_file(HAVE_LIBPNG_PNG_H libpng/png.h)
+ find_file(HAVE_LOCALE_H locale.h)
+ find_file(HAVE_OPENGL_GLU_H OpenGL/glu.h)
+-find_file(HAVE_PNG_H png.h)
+#find_file(HAVE_PNG_H png.h)
+ find_file(HAVE_PTHREAD_H pthread.h)
+ find_file(HAVE_STDIO_H stdio.h)
+ find_file(HAVE_STRINGS_H strings.h)
+@@ -38,6 +38,17 @@ find_file(HAVE_SYS_STDTYPES_H sys/stdtypes.h)
+ find_file(HAVE_X11_XREGION_H X11/Xregion.h)
+ find_path(HAVE_XDBE_H Xdbe.h PATH_SUFFIXES X11/extensions extensions)
+ 
+find_package(PNG REQUIRED)
+if(PNG_FOUND)
+	set(LIB_png ${PNG_LIBRARIES})
+	set(HAVE_PNG_H ${PNG_FOUND})
+	
+endif()
+find_package(ZLIB REQUIRED)
+if(ZLIB_FOUND)
+	set(LIB_zlib ${ZLIB_LIBRARIES})
+endif()
+
+ if (MSVC)
+   message(STATUS "Note: The following three headers should all be found!")
+   message(STATUS "HAVE_GL_GL_H = '${HAVE_GL_GL_H}'")
+@@ -92,12 +103,12 @@ find_library(LIB_freetype freetype)
+ find_library(LIB_GL GL)
+ find_library(LIB_MesaGL MesaGL)
+ find_library(LIB_jpeg jpeg)
+-find_library(LIB_png png)
+-find_library(LIB_zlib z)
+#find_library(LIB_png png)
+#find_library(LIB_zlib z)
+ 
+ mark_as_advanced(LIB_CAIRO LIB_dl LIB_fontconfig LIB_freetype)
+ mark_as_advanced(LIB_GL LIB_MesaGL)
+-mark_as_advanced(LIB_jpeg LIB_png LIB_zlib)
+mark_as_advanced(LIB_jpeg)
+ 
+ #######################################################################
+ # functions
--- a/ports/fltk/portfile.cmake
+++ b/ports/fltk/portfile.cmake
@ -0,0 +1,68 @@
+# Common Ambient Variables:
+#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
+#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
+#   PORT is the current port name (zlib, etc)
+#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fltk-1.3.4-1)
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://fltk.org/pub/fltk/1.3.4/fltk-1.3.4-1-source.tar.gz"
+    FILENAME "fltk.tar.gz"
+    SHA512 0be1c8e6bb7a8c7ef484941a73868d5e40b90e97a8e5dc747bac2be53a350621975406ecfd4a9bcee8eeb7afd886e75bf7a6d6478fd6c56d16e54059f22f0891
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fltk-1.3.4-1
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/findlibsfix.patch"
+)
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(BUILD_SHARED ON)
+else()
+    set(BUILD_SHARED OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS 
+        -DOPTION_BUILD_EXAMPLES=OFF
+        -DOPTION_BUILD_SHARED_LIBS=${BUILD_SHARED}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/CMAKE
+    ${CURRENT_PACKAGES_DIR}/debug/CMAKE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fluid.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fltk-config)
+
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fluid.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config)
+vcpkg_copy_pdbs()
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+
+	
+else()
+	file(REMOVE_RECURSE
+		${CURRENT_PACKAGES_DIR}/debug/bin
+		${CURRENT_PACKAGES_DIR}/bin
+	)
+
+   
+endif()
+
+
+
+file(INSTALL
+    ${SOURCE_PATH}/COPYING
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/fltk
+    RENAME copyright
+)
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@ -1,3 +1,3 @@
 Source: fmt
-Version: 3.0.1-1
+Version: 3.0.1-4
 Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@ -13,6 +13,7 @@ vcpkg_extract_source_archive(${ARCHIVE_FILE})

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
    OPTIONS
        -DFMT_CMAKE_DIR=share/fmt
        -DFMT_TEST=OFF
@ -29,10 +30,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll)
    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmt.dll)

+    # Force FMT_SHARED to 1
+    file(READ ${CURRENT_PACKAGES_DIR}/include/fmt/format.h FMT_FORMAT_H)
+    string(REPLACE "defined(FMT_SHARED)" "1" FMT_FORMAT_H "${FMT_FORMAT_H}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/include/fmt/format.h "${FMT_FORMAT_H}")
 endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/format.cc)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/ostream.cc)
+#file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/format.cc)
+#file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/ostream.cc)
 file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/fmt/fmt-targets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake)
 file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE)
 string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" FMT_DEBUG_MODULE "${FMT_DEBUG_MODULE}")
--- a/ports/fontconfig/CMakeLists.txt
+++ b/ports/fontconfig/CMakeLists.txt
@ -0,0 +1,80 @@
+cmake_minimum_required(VERSION 3.0)
+project(fontconfig)
+
+add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
+add_definitions(-FI${FC_INCLUDE_DIR}/config.h)
+
+if(CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(LIB_SUFFIX d)
+endif()
+
+# find dependencies
+find_path(ICONV_INCLUDE_DIR iconv.h)
+find_library(ICONV_LIBRARY NAMES iconv libiconv)
+find_path(FREETYPE_INCLUDE_DIR ft2build.h)
+find_library(FREETYPE_LIBRARY freetype${LIB_SUFFIX})
+find_path(EXPAT_INCLUDE_DIR expat.h)
+find_library(EXPAT_LIBRARY expat)
+
+add_library(fontconfig
+    src/fcatomic.c
+    src/fcblanks.c
+    src/fccache.c
+    src/fccfg.c
+    src/fccharset.c
+    src/fccompat.c
+    src/fcdbg.c
+    src/fcdefault.c
+    src/fcdir.c
+    src/fcformat.c
+    src/fcfreetype.c
+    src/fcfs.c
+    src/fcinit.c
+    src/fclang.c
+    src/fclist.c
+    src/fcmatch.c
+    src/fcmatrix.c
+    src/fcname.c
+    src/fcobjs.c
+    src/fcpat.c
+    src/fcrange.c
+    src/fcserialize.c
+    src/fcstat.c
+    src/fcstr.c
+    src/fcweight.c
+    src/fcxml.c
+    src/ftglue.c)
+
+target_include_directories(fontconfig PRIVATE .
+    ${FC_INCLUDE_DIR}
+    ${FREETYPE_INCLUDE_DIR}
+    ${EXPAT_INCLUDE_DIR}
+    ${ICONV_INCLUDE_DIR})
+
+target_link_libraries(fontconfig
+    ${FREETYPE_LIBRARY}
+    ${ICONV_LIBRARY}
+    ${EXPAT_LIBRARY})
+
+install(TARGETS fontconfig
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib)
+
+if(NOT FC_SKIP_HEADERS)
+    install(FILES
+        fontconfig/fontconfig.h
+        fontconfig/fcfreetype.h
+        fontconfig/fcprivate.h
+        DESTINATION include/fontconfig)
+endif()
+
+if(NOT FC_SKIP_TOOLS)
+    set(FC_DEFAULT_FONTS WINDOWSFONTDIR)
+    set(FC_FONTPATH)
+    set(FC_CACHEDIR WINDOWSTEMPDIR_FONTCONFIG_CACHE)
+    set(CONFIGDIR ./fonts/conf.d)
+    configure_file(fonts.conf.in ${CMAKE_SOURCE_DIR}/fonts.conf @ONLY)
+    install(FILES fonts.conf DESTINATION tools/fontconfig/fonts)
+    install(DIRECTORY conf.d DESTINATION tools/fontconfig/fonts FILES_MATCHING PATTERN "*.conf")
+endif()
--- a/ports/fontconfig/CONTROL
+++ b/ports/fontconfig/CONTROL
@ -0,0 +1,4 @@
+Source: fontconfig
+Version: 2.12.1
+Description: Library for configuring and customizing font access.
+Build-Depends: freetype, expat, libiconv
--- a/ports/fontconfig/include/config.h
+++ b/ports/fontconfig/include/config.h
@ -0,0 +1,267 @@
+
+#define FC_CACHEDIR "./"
+
+/* The normal alignment of `double', in bytes. */
+#define ALIGNOF_DOUBLE 8
+
+/* Use libxml2 instead of Expat */
+/* #undef ENABLE_LIBXML2 */
+
+/* Additional font directories */
+#define FC_ADD_FONTS "yes"
+
+/* Architecture prefix to use for cache file names */
+/* #undef FC_ARCHITECTURE */
+
+/* System font directory */
+#define FC_DEFAULT_FONTS "c:/windows/fonts"
+
+/* Define to nothing if C supports flexible array members, and to 1 if it does
+   not. That way, with a declaration like `struct s { int n; double
+   d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
+   compilers. When computing the size of such an object, don't use 'sizeof
+   (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)'
+   instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with
+   MSVC and with C++ compilers. */
+#define FLEXIBLE_ARRAY_MEMBER /**/
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `fstatfs' function. */
+/* #undef HAVE_FSTATFS */
+
+/* Define to 1 if you have the `fstatvfs' function. */
+/* #undef HAVE_FSTATVFS */
+
+/* FT_Bitmap_Size structure includes y_ppem field */
+#define HAVE_FT_BITMAP_SIZE_Y_PPEM 1
+
+/* Define to 1 if you have the `FT_Get_BDF_Property' function. */
+#define HAVE_FT_GET_BDF_PROPERTY 1
+
+/* Define to 1 if you have the `FT_Get_Next_Char' function. */
+#define HAVE_FT_GET_NEXT_CHAR 1
+
+/* Define to 1 if you have the `FT_Get_PS_Font_Info' function. */
+#define HAVE_FT_GET_PS_FONT_INFO 1
+
+/* Define to 1 if you have the `FT_Get_X11_Font_Format' function. */
+#define HAVE_FT_GET_X11_FONT_FORMAT 1
+
+/* Define to 1 if you have the `FT_Has_PS_Glyph_Names' function. */
+#define HAVE_FT_HAS_PS_GLYPH_NAMES 1
+
+/* Define to 1 if you have the `FT_Select_Size' function. */
+#define HAVE_FT_SELECT_SIZE 1
+
+/* Define to 1 if you have the `getexecname' function. */
+/* #undef HAVE_GETEXECNAME */
+
+/* Define to 1 if you have the `getopt' function. */
+#define HAVE_GETOPT 1
+
+/* Define to 1 if you have the `getopt_long' function. */
+#define HAVE_GETOPT_LONG 1
+
+/* Define to 1 if you have the `getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
+
+/* Define to 1 if you have the `getprogname' function. */
+/* #undef HAVE_GETPROGNAME */
+
+/* Have Intel __sync_* atomic primitives */
+#define HAVE_INTEL_ATOMIC_PRIMITIVES 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `link' function. */
+/* #undef HAVE_LINK */
+
+/* Define to 1 if you have the `lrand48' function. */
+/* #undef HAVE_LRAND48 */
+
+/* Define to 1 if you have the `lstat' function. */
+/* #undef HAVE_LSTAT */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkdtemp' function. */
+/* #undef HAVE_MKDTEMP */
+
+/* Define to 1 if you have the `mkostemp' function. */
+/* #undef HAVE_MKOSTEMP */
+
+/* Define to 1 if you have the `mkstemp' function. */
+/* #undef HAVE_MKSTEMP */
+
+/* Define to 1 if you have a working `mmap' system call. */
+/* #undef HAVE_MMAP */
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the 'posix_fadvise' function. */
+/* #undef HAVE_POSIX_FADVISE */
+
+/* Have POSIX threads */
+/* #undef HAVE_PTHREAD */
+
+/* Have PTHREAD_PRIO_INHERIT. */
+/* #undef HAVE_PTHREAD_PRIO_INHERIT */
+
+/* Define to 1 if you have the `rand' function. */
+#define HAVE_RAND 1
+
+/* Define to 1 if you have the `random' function. */
+/* #undef HAVE_RANDOM */
+
+/* Define to 1 if you have the `random_r' function. */
+/* #undef HAVE_RANDOM_R */
+
+/* Define to 1 if you have the `rand_r' function. */
+/* #undef HAVE_RAND_R */
+
+/* Define to 1 if you have the `readlink' function. */
+/* #undef HAVE_READLINK */
+
+/* Define to 1 if you have the 'scandir' function. */
+/* #undef HAVE_SCANDIR */
+
+/* Define to 1 if you have the 'scandir' function with int (* compar)(const
+   void *, const void *) */
+/* #undef HAVE_SCANDIR_VOID_P */
+
+/* Define to 1 if you have the <sched.h> header file. */
+/* #undef HAVE_SCHED_H */
+
+/* Have sched_yield */
+/* #undef HAVE_SCHED_YIELD */
+
+/* Have Solaris __machine_*_barrier and atomic_* operations */
+/* #undef HAVE_SOLARIS_ATOMIC_OPS */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if `d_type' is a member of `struct dirent'. */
+/* #undef HAVE_STRUCT_DIRENT_D_TYPE */
+
+/* Define to 1 if `st_mtim' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_MTIM */
+
+/* Define to 1 if `f_flags' is a member of `struct statfs'. */
+/* #undef HAVE_STRUCT_STATFS_F_FLAGS */
+
+/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
+/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
+
+/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
+/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
+
+/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */
+/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/mount.h> header file. */
+/* #undef HAVE_SYS_MOUNT_H */
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */
+
+/* Define to 1 if you have the <sys/statfs.h> header file. */
+/* #undef HAVE_SYS_STATFS_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/vfs.h> header file. */
+/* #undef HAVE_SYS_VFS_H */
+
+/* Define to 1 if `usLowerOpticalPointSize' is a member of `TT_OS2'. */
+/* #undef HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE */
+
+/* Define to 1 if `usUpperOpticalPointSize' is a member of `TT_OS2'. */
+/* #undef HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Can use #warning in C files */
+#define HAVE_WARNING_CPP_DIRECTIVE 1
+
+/* Use xmlparse.h instead of expat.h */
+/* #undef HAVE_XMLPARSE_H */
+
+/* Define to 1 if you have the `XML_SetDoctypeDeclHandler' function. */
+#define HAVE_XML_SETDOCTYPEDECLHANDLER 1
+
+/* Define to 1 if you have the `_mktemp_s' function. */
+#define HAVE__MKTEMP_S 1
+
+/* Define to necessary symbol if this constant
+ uses a non-standard name on
+   your system. */
+/* #undef PTHREAD_CREATE_JOINABLE */
+
+/* The size of `char', as computed by sizeof. */
+#define SIZEOF_CHAR 1
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `void*', as computed by sizeof. */
+/* The size of `void *', as computed by sizeof. */
+#if defined(_WIN64)
+#define SIZEOF_VOIDP 8
+#define SIZEOF_VOID_P 8
+#else
+#define SIZEOF_VOIDP 4
+#define SIZEOF_VOID_P 4
+#endif
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Use iconv. */
+#define USE_ICONV 1
--- a/ports/fontconfig/include/fcaliastail.h
+++ b/ports/fontconfig/include/fcaliastail.h
@ -0,0 +1 @@
+/* intentionally empty */
--- a/ports/fontconfig/include/fcftaliastail.h
+++ b/ports/fontconfig/include/fcftaliastail.h
@ -0,0 +1 @@
+/* intentionally empty */
--- a/ports/fontconfig/include/fcobjshash.h
+++ b/ports/fontconfig/include/fcobjshash.h
@ -0,0 +1,328 @@
+/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf -m 100 src/fcobjshash.gperf  */
+/* Computed positions: -k'2-3' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+#line 1 "src/fcobjshash.gperf"
+
+#line 13 "src/fcobjshash.gperf"
+struct FcObjectTypeInfo {
+int name;
+int id;
+};
+#include <string.h>
+/* maximum key range = 56, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+FcObjectTypeHash (register const char *str, register unsigned int len)
+{
+  static const unsigned char asso_values[] =
+    {
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 21, 30,  3,
+      36, 45, 60,  3, 15,  0, 60, 60,  0,  9,
+       9,  0, 21, 60,  0,  0, 15,  0, 60, 60,
+       0, 15, 24, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+      60, 60, 60, 60, 60, 60
+    };
+  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[1]];
+}
+
+struct FcObjectTypeNamePool_t
+  {
+    char FcObjectTypeNamePool_str4[sizeof("file")];
+    char FcObjectTypeNamePool_str5[sizeof("color")];
+    char FcObjectTypeNamePool_str7[sizeof("foundry")];
+    char FcObjectTypeNamePool_str8[sizeof("fullname")];
+    char FcObjectTypeNamePool_str9[sizeof("pixelsize")];
+    char FcObjectTypeNamePool_str10[sizeof("prgname")];
+    char FcObjectTypeNamePool_str12[sizeof("fullnamelang")];
+    char FcObjectTypeNamePool_str13[sizeof("globaladvance")];
+    char FcObjectTypeNamePool_str14[sizeof("postscriptname")];
+    char FcObjectTypeNamePool_str16[sizeof("hinting")];
+    char FcObjectTypeNamePool_str17[sizeof("minspace")];
+    char FcObjectTypeNamePool_str18[sizeof("hintstyle")];
+    char FcObjectTypeNamePool_str19[sizeof("fontformat")];
+    char FcObjectTypeNamePool_str20[sizeof("fontversion")];
+    char FcObjectTypeNamePool_str21[sizeof("fontfeatures")];
+    char FcObjectTypeNamePool_str22[sizeof("outline")];
+    char FcObjectTypeNamePool_str23[sizeof("autohint")];
+    char FcObjectTypeNamePool_str24[sizeof("dpi")];
+    char FcObjectTypeNamePool_str25[sizeof("hash")];
+    char FcObjectTypeNamePool_str26[sizeof("slant")];
+    char FcObjectTypeNamePool_str27[sizeof("aspect")];
+    char FcObjectTypeNamePool_str28[sizeof("size")];
+    char FcObjectTypeNamePool_str29[sizeof("scale")];
+    char FcObjectTypeNamePool_str30[sizeof("symbol")];
+    char FcObjectTypeNamePool_str31[sizeof("rasterizer")];
+    char FcObjectTypeNamePool_str32[sizeof("scalable")];
+    char FcObjectTypeNamePool_str33[sizeof("antialias")];
+    char FcObjectTypeNamePool_str34[sizeof("lang")];
+    char FcObjectTypeNamePool_str35[sizeof("style")];
+    char FcObjectTypeNamePool_str36[sizeof("family")];
+    char FcObjectTypeNamePool_str37[sizeof("rgba")];
+    char FcObjectTypeNamePool_str38[sizeof("namelang")];
+    char FcObjectTypeNamePool_str39[sizeof("stylelang")];
+    char FcObjectTypeNamePool_str40[sizeof("familylang")];
+    char FcObjectTypeNamePool_str41[sizeof("width")];
+    char FcObjectTypeNamePool_str42[sizeof("matrix")];
+    char FcObjectTypeNamePool_str43[sizeof("charset")];
+    char FcObjectTypeNamePool_str45[sizeof("charwidth")];
+    char FcObjectTypeNamePool_str46[sizeof("charheight")];
+    char FcObjectTypeNamePool_str47[sizeof("embolden")];
+    char FcObjectTypeNamePool_str48[sizeof("lcdfilter")];
+    char FcObjectTypeNamePool_str49[sizeof("spacing")];
+    char FcObjectTypeNamePool_str50[sizeof("index")];
+    char FcObjectTypeNamePool_str51[sizeof("weight")];
+    char FcObjectTypeNamePool_str52[sizeof("capability")];
+    char FcObjectTypeNamePool_str53[sizeof("embeddedbitmap")];
+    char FcObjectTypeNamePool_str58[sizeof("decorative")];
+    char FcObjectTypeNamePool_str59[sizeof("verticallayout")];
+  };
+static const struct FcObjectTypeNamePool_t FcObjectTypeNamePool_contents =
+  {
+    "file",
+    "color",
+    "foundry",
+    "fullname",
+    "pixelsize",
+    "prgname",
+    "fullnamelang",
+    "globaladvance",
+    "postscriptname",
+    "hinting",
+    "minspace",
+    "hintstyle",
+    "fontformat",
+    "fontversion",
+    "fontfeatures",
+    "outline",
+    "autohint",
+    "dpi",
+    "hash",
+    "slant",
+    "aspect",
+    "size",
+    "scale",
+    "symbol",
+    "rasterizer",
+    "scalable",
+    "antialias",
+    "lang",
+    "style",
+    "family",
+    "rgba",
+    "namelang",
+    "stylelang",
+    "familylang",
+    "width",
+    "matrix",
+    "charset",
+    "charwidth",
+    "charheight",
+    "embolden",
+    "lcdfilter",
+    "spacing",
+    "index",
+    "weight",
+    "capability",
+    "embeddedbitmap",
+    "decorative",
+    "verticallayout"
+  };
+#define FcObjectTypeNamePool ((const char *) &FcObjectTypeNamePool_contents)
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct FcObjectTypeInfo *
+FcObjectTypeLookup (register const char *str, register unsigned int len)
+{
+  enum
+    {
+      TOTAL_KEYWORDS = 48,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 14,
+      MIN_HASH_VALUE = 4,
+      MAX_HASH_VALUE = 59
+    };
+
+  static const struct FcObjectTypeInfo wordlist[] =
+    {
+      {-1}, {-1}, {-1}, {-1},
+#line 38 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str4,FC_FILE_OBJECT},
+#line 64 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str5,FC_COLOR_OBJECT},
+      {-1},
+#line 31 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str7,FC_FOUNDRY_OBJECT},
+#line 22 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str8,FC_FULLNAME_OBJECT},
+#line 29 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str9,FC_PIXEL_SIZE_OBJECT},
+#line 61 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str10,FC_PRGNAME_OBJECT},
+      {-1},
+#line 23 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str12,FC_FULLNAMELANG_OBJECT},
+#line 37 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str13,FC_GLOBAL_ADVANCE_OBJECT},
+#line 63 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str14,FC_POSTSCRIPT_NAME_OBJECT},
+      {-1},
+#line 34 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str16,FC_HINTING_OBJECT},
+#line 46 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str17,FC_MINSPACE_OBJECT},
+#line 33 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str18,FC_HINT_STYLE_OBJECT},
+#line 54 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str19,FC_FONTFORMAT_OBJECT},
+#line 52 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str20,FC_FONTVERSION_OBJECT},
+#line 60 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str21,FC_FONT_FEATURES_OBJECT},
+#line 41 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str22,FC_OUTLINE_OBJECT},
+#line 36 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str23,FC_AUTOHINT_OBJECT},
+#line 43 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str24,FC_DPI_OBJECT},
+#line 62 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str25,FC_HASH_OBJECT},
+#line 24 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str26,FC_SLANT_OBJECT},
+#line 28 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str27,FC_ASPECT_OBJECT},
+#line 27 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str28,FC_SIZE_OBJECT},
+#line 45 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str29,FC_SCALE_OBJECT},
+#line 65 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str30,FC_SYMBOL_OBJECT},
+#line 40 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str31,FC_RASTERIZER_OBJECT},
+#line 42 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str32,FC_SCALABLE_OBJECT},
+#line 32 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str33,FC_ANTIALIAS_OBJECT},
+#line 51 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str34,FC_LANG_OBJECT},
+#line 20 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str35,FC_STYLE_OBJECT},
+#line 18 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str36,FC_FAMILY_OBJECT},
+#line 44 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str37,FC_RGBA_OBJECT},
+#line 59 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str38,FC_NAMELANG_OBJECT},
+#line 21 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str39,FC_STYLELANG_OBJECT},
+#line 19 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str40,FC_FAMILYLANG_OBJECT},
+#line 26 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_WIDTH_OBJECT},
+#line 49 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str42,FC_MATRIX_OBJECT},
+#line 50 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT},
+      {-1},
+#line 47 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT},
+#line 48 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT},
+#line 55 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str47,FC_EMBOLDEN_OBJECT},
+#line 58 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str48,FC_LCD_FILTER_OBJECT},
+#line 30 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str49,FC_SPACING_OBJECT},
+#line 39 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str50,FC_INDEX_OBJECT},
+#line 25 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str51,FC_WEIGHT_OBJECT},
+#line 53 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str52,FC_CAPABILITY_OBJECT},
+#line 56 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str53,FC_EMBEDDED_BITMAP_OBJECT},
+      {-1}, {-1}, {-1}, {-1},
+#line 57 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str58,FC_DECORATIVE_OBJECT},
+#line 35 "src/fcobjshash.gperf"
+      {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str59,FC_VERTICAL_LAYOUT_OBJECT}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = FcObjectTypeHash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + FcObjectTypeNamePool;
+
+              if (*str == *s && !strcmp (str + 1, s + 1))
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
--- a/ports/fontconfig/include/fcstdint.h
+++ b/ports/fontconfig/include/fcstdint.h
@ -0,0 +1,8 @@
+#ifndef _FONTCONFIG_SRC_FCSTDINT_H
+#define _FONTCONFIG_SRC_FCSTDINT_H 1
+#ifndef _GENERATED_STDINT_H
+#define _GENERATED_STDINT_H "fontconfig 2.12.1"
+#define _STDINT_HAVE_STDINT_H 1
+#include <stdint.h>
+#endif
+#endif
--- a/ports/fontconfig/include/unistd.h
+++ b/ports/fontconfig/include/unistd.h
@ -0,0 +1,21 @@
+/*  Minimal unistd.h, just to get fontconfig to compile */
+#ifndef UNISTD_H
+#define UNISTD_H
+
+#include <io.h>
+
+#ifndef R_OK
+#define R_OK 4
+#endif
+
+#ifndef W_OK
+#define W_OK 2
+#endif
+
+#ifndef F_OK
+#define F_OK 0
+#endif
+
+typedef int mode_t;
+
+#endif
--- a/ports/fontconfig/portfile.cmake
+++ b/ports/fontconfig/portfile.cmake
@ -0,0 +1,39 @@
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fontconfig-2.12.1)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.1.tar.gz"
+    FILENAME "fontconfig-2.12.1.tar.gz"
+    SHA512 0959a80522e09551e49ec7b2383b7dfb319d4e1c058ad0b55bb35d3f675acbb7ff08c9c30a8798b731070687f84dd3d2ff7e28aafac6ecfa9d3f85c5847c0955)
+
+# Download single-header implementation of dirent API for Windows and it's license
+vcpkg_download_distfile(DIRENT_H
+    URLS "https://raw.githubusercontent.com/tronkko/dirent/8b1db5092479a73d47eafd3de739b27e876e6bf3/include/dirent.h"
+    FILENAME "fontconfig-dirent.h"
+    SHA512 dc9e63fd9cf4ccffdc052f92933633ef9d09dfcfe3b1d15f1f32c99349babd36a62d02283e3d8ba7766d92817be015eb211f11efc4fa52cc90d532a34d1ae785)
+vcpkg_download_distfile(DIRENT_LICENSE
+    URLS "https://raw.githubusercontent.com/tronkko/dirent/8b1db5092479a73d47eafd3de739b27e876e6bf3/LICENSE"
+    FILENAME "fontconfig-dirent-license"
+    SHA512 58c294f80b679252dbee9687ff6bda660fe1ed6f94506e1b9edc19358de98b274b25b3697bdcd34becb28a4f186c6d321a16ab616164e2fb378b37357fc71e4f)
+
+vcpkg_extract_source_archive(${ARCHIVE})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${DIRENT_H} DESTINATION ${SOURCE_PATH})
+file(RENAME ${SOURCE_PATH}/fontconfig-dirent.h ${SOURCE_PATH}/dirent.h)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
+        -DFC_INCLUDE_DIR=${CMAKE_CURRENT_LIST_DIR}/include
+    OPTIONS_DEBUG
+        -DFC_SKIP_TOOLS=ON
+        -DFC_SKIP_HEADERS=ON)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fontconfig)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/fontconfig/COPYING ${CURRENT_PACKAGES_DIR}/share/fontconfig/copyright)
+file(COPY ${DIRENT_LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/fontconfig)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/fontconfig/fontconfig-dirent-license ${CURRENT_PACKAGES_DIR}/share/fontconfig/dirent-for-vs-copyright)
--- a/ports/freetype/0003-Fix-UWP.patch
+++ b/ports/freetype/0003-Fix-UWP.patch
@ -0,0 +1,63 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 744b2d5..d114b9b 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -312,6 +312,9 @@ else ()
+   set(BASE_SRCS ${BASE_SRCS} src/base/ftdebug.c)
+ endif ()
+ 
+if(MSVC)
+  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
+endif()
+ 
+ if (BUILD_FRAMEWORK)
+   set(BASE_SRCS
+diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
+index 4666d48..382a915 100644
+--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
+@@ -845,6 +845,9 @@ FT_BEGIN_HEADER
+   /*************************************************************************/
+   /*************************************************************************/
+ 
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
+#define generic GenericFromFreeTypeLibrary
+#endif
+ 
+   /*************************************************************************/
+   /*                                                                       */
+@@ -1777,6 +1780,10 @@ FT_BEGIN_HEADER
+ 
+   } FT_GlyphSlotRec;
+ 
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
+#undef generic
+#endif
+
+ 
+   /*************************************************************************/
+   /*************************************************************************/
+diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
+index fa05347..ae2754b 100644
+--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
+@@ -457,6 +457,9 @@
+     return error;
+   }
+ 
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
+#define generic GenericFromFreeTypeLibrary
+#endif
+ 
+   /* documentation is in ftobjs.h */
+ 
+@@ -971,6 +974,9 @@
+     FT_FREE( face );
+   }
+ 
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
+#undef generic
+#endif
+ 
+   static void
+   Destroy_Driver( FT_Driver  driver )
--- a/ports/freetype/CONTROL
+++ b/ports/freetype/CONTROL
@ -1,4 +1,4 @@
 Source: freetype
-Version: 2.6.3-2
-Build-Depends: zlib
+Version: 2.6.3-4
+Build-Depends: zlib, bzip2, libpng
 Description: A library to render fonts.
--- a/ports/freetype/portfile.cmake
+++ b/ports/freetype/portfile.cmake
@ -11,12 +11,17 @@ vcpkg_apply_patches(
    SOURCE_PATH ${SOURCE_PATH}
    PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch
            ${CMAKE_CURRENT_LIST_DIR}/0002-Add-CONFIG_INSTALL_PATH-option.patch
+            ${CMAKE_CURRENT_LIST_DIR}/0003-Fix-UWP.patch
 )

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    OPTIONS
        -DCONFIG_INSTALL_PATH=share/freetype
+        -DWITH_ZLIB=ON
+        -DWITH_BZip2=ON
+        -DWITH_PNG=ON
+        -DWITH_HarfBuzz=OFF
 )

 vcpkg_install_cmake()
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@ -1,4 +1,4 @@
 Source: gdal
-Version: 1.11.3
+Version: 1.11.3-1
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
-Build-Depends: proj
+Build-Depends: proj, libpng
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@ -32,15 +32,23 @@ file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR)
 file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal" NATIVE_DATA_DIR)
 file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal/html" NATIVE_HTML_DIR)

+# Setup proj4 libraries + include path
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PROJ_INCLUDE_DIR)
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/proj.lib" PROJ_LIBRARY_REL)
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib" PROJ_LIBRARY_DBG)

+# Setup libpng libraries + include path
+file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PNG_INCLUDE_DIR)
+file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" PNG_LIBRARY_REL)
+file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRARY_DBG)
+
 set(NMAKE_OPTIONS
    GDAL_HOME=${NATIVE_PACKAGES_DIR}
    DATADIR=${NATIVE_DATA_DIR}
    HTMLDIR=${NATIVE_HTML_DIR}
    PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR}
+    PNG_EXTERNAL_LIB=1
+    PNGDIR=${PNG_INCLUDE_DIR}
    MSVC_VER=1900
 )

@ -65,12 +73,14 @@ set(NMAKE_OPTIONS_REL
    "${NMAKE_OPTIONS}"
    CXX_CRT_FLAGS=${LINKAGE_FLAGS}
    PROJ_LIBRARY=${PROJ_LIBRARY_REL}
+    PNG_LIB=${PNG_LIBRARY_REL}
 )

 set(NMAKE_OPTIONS_DBG
    "${NMAKE_OPTIONS}"
    CXX_CRT_FLAGS="${LINKAGE_FLAGS}d"
    PROJ_LIBRARY=${PROJ_LIBRARY_DBG}
+    PNG_LIB=${PNG_LIBRARY_DBG}	
    DEBUG=1
 )
 ################
--- a/ports/gdk-pixbuf/CMakeLists.txt
+++ b/ports/gdk-pixbuf/CMakeLists.txt
@ -0,0 +1,128 @@
+cmake_minimum_required(VERSION 3.0)
+project(gdk-pixbuf)
+
+set(GDK_PIXBUF_LIB_SUFFIX 2.0)
+set(GDK_PIXBUF_DLL_SUFFIX 2)
+set(GDK_PIXBUF_BINARY_VERSION 2.10.0)
+set(GLIB_LIB_VERSION 2.0)
+
+find_package(ZLIB REQUIRED)
+find_package(PNG REQUIRED)
+
+find_path(GLIB_INCLUDE_DIR glib.h)
+find_library(GLIB_GLIB_LIBRARY glib-${GLIB_LIB_VERSION})
+find_library(GLIB_GIO_LIBRARY gio-${GLIB_LIB_VERSION})
+find_library(GLIB_GOBJECT_LIBRARY gobject-${GLIB_LIB_VERSION})
+find_library(GLIB_GMODULE_LIBRARY gmodule-${GLIB_LIB_VERSION})
+set(GLIB_LIBRARIES ${GLIB_GLIB_LIBRARY} ${GLIB_GOBJECT_LIBRARY} ${GLIB_GMODULE_LIBRARY} ${GLIB_GIO_LIBRARY})
+
+find_path(LIBINTL_INCLUDE_DIR libintl.h)
+find_library(LIBINTL_LIBRARY NAMES libintl intl)
+
+configure_file(./config.h.win32 ${CMAKE_SOURCE_DIR}/config.h COPYONLY)
+include_directories(. ./gdk-pixbuf)
+
+add_library(gdk-pixbuf
+    gdk-pixbuf/gdk-pixbuf.c
+    gdk-pixbuf/gdk-pixbuf-animation.c
+    gdk-pixbuf/gdk-pixbuf-data.c
+    gdk-pixbuf/gdk-pixbuf-io.c
+    gdk-pixbuf/gdk-pixbuf-loader.c
+    gdk-pixbuf/gdk-pixbuf-scale.c
+    gdk-pixbuf/gdk-pixbuf-simple-anim.c
+    gdk-pixbuf/gdk-pixbuf-scaled-anim.c
+    gdk-pixbuf/gdk-pixbuf-util.c
+    gdk-pixbuf/gdk-pixdata.c
+    gdk-pixbuf/gdk-pixbuf-enum-types.c
+    gdk-pixbuf/io-ani.c
+    gdk-pixbuf/io-ani-animation.c
+    gdk-pixbuf/io-icns.c
+    gdk-pixbuf/io-pnm.c
+    gdk-pixbuf/io-png.c
+    gdk-pixbuf/io-qtif.c
+    gdk-pixbuf/io-tga.c
+    gdk-pixbuf/gdk-pixbuf-buffer-queue.c
+    gdk-pixbuf/io-xpm.c
+    gdk-pixbuf/io-xbm.c
+    gdk-pixbuf/pixops/pixops.c
+    gdk-pixbuf/io-gdip-animation.c
+    gdk-pixbuf/io-gdip-bmp.c
+    gdk-pixbuf/io-gdip-emf.c
+    gdk-pixbuf/io-gdip-gif.c
+    gdk-pixbuf/io-gdip-ico.c
+    gdk-pixbuf/io-gdip-jpeg.c
+    gdk-pixbuf/io-gdip-tiff.c
+    gdk-pixbuf/io-gdip-utils.c
+    gdk-pixbuf/io-gdip-wmf.c)
+
+target_include_directories(gdk-pixbuf PRIVATE 
+    ${GLIB_INCLUDE_DIR} 
+    ${PNG_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIRS}
+    ${LIBINTL_INCLUDE_DIR})
+
+target_link_libraries(gdk-pixbuf 
+    ${GLIB_LIBRARIES} 
+    ${ZLIB_LIBRARIES} 
+    ${PNG_LIBRARIES} 
+    ${LIBINTL_LIBRARY}
+    Gdiplus)
+
+target_compile_definitions(gdk-pixbuf PRIVATE
+    HAVE_CONFIG_H
+    GDK_PIXBUF_COMPILATION
+    GDK_PIXBUF_ENABLE_BACKEND
+    DLL_EXPORT
+    GDK_PIXBUF_RELOCATABLE
+    GDK_PIXBUF_PREFIX="/dummy"
+    GDK_PIXBUF_BINARY_VERSION="${GDK_PIXBUF_BINARY_VERSION}"
+    INCLUDE_ani
+    INCLUDE_tga
+    INCLUDE_xbm
+    INCLUDE_png
+    INCLUDE_qtif
+    INCLUDE_pnm
+    INCLUDE_icns
+    INCLUDE_xpm
+    INCLUDE_gdiplus
+    G_DISABLE_SINGLE_INCLUDES
+    GDK_PIXBUF_DISABLE_SINGLE_INCLUDES)
+
+set_target_properties(gdk-pixbuf PROPERTIES 
+    OUTPUT_NAME gdk_pixbuf-${GDK_PIXBUF_DLL_SUFFIX}
+    ARCHIVE_OUTPUT_NAME gdk_pixbuf-${GDK_PIXBUF_LIB_SUFFIX})
+
+install(TARGETS gdk-pixbuf
+    RUNTIME DESTINATION bin 
+    ARCHIVE DESTINATION lib 
+    LIBRARY DESTINATION lib)
+
+macro(gdk_add_tool TOOL_NAME)
+    add_executable(${TOOL_NAME} ${ARGN})
+    target_include_directories(${TOOL_NAME} PRIVATE ${GLIB_INCLUDE_DIR})
+    target_link_libraries(${TOOL_NAME} gdk-pixbuf ${GLIB_LIBRARIES})
+    install(TARGETS ${TOOL_NAME} RUNTIME DESTINATION tools/gdk-pixbuf)
+endmacro()  
+
+if(NOT GDK_SKIP_TOOLS)
+    gdk_add_tool(gdk-pixbuf-csource gdk-pixbuf/gdk-pixbuf-csource.c)
+    gdk_add_tool(gdk-pixbuf-pixdata gdk-pixbuf/gdk-pixbuf-pixdata.c)
+endif()
+
+if(NOT GDK_SKIP_HEADERS)
+    INSTALL(FILES
+        gdk-pixbuf/gdk-pixbuf.h
+        gdk-pixbuf/gdk-pixbuf-autocleanups.h
+        gdk-pixbuf/gdk-pixbuf-core.h 
+        gdk-pixbuf/gdk-pixbuf-transform.h 
+        gdk-pixbuf/gdk-pixbuf-io.h 
+        gdk-pixbuf/gdk-pixbuf-animation.h 
+        gdk-pixbuf/gdk-pixbuf-simple-anim.h
+        gdk-pixbuf/gdk-pixbuf-loader.h 
+        gdk-pixbuf/gdk-pixbuf-enum-types.h 
+        gdk-pixbuf/gdk-pixbuf-marshal.h 
+        gdk-pixbuf/gdk-pixbuf-features.h 
+        gdk-pixbuf/gdk-pixdata.h
+        gdk-pixbuf/gdk-pixbuf-macros.h
+        DESTINATION include/gdk-pixbuf)
+endif()
--- a/Show More
+++ b/Show More