reapack

commit 76582801deb063e52264db2bc0cb051d4917d783
parent 63e6a6518815fdf505037cae6aa20b52b93eb2b3
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Sat,  7 Sep 2019 21:13:44 -0400

reenable the file:// protocol on Windows [p=2142236][p=2178898]

Diffstat:
M
.appveyor.yml
 | 
3
+--
M
README.md
 | 
1
-
D
vendor/.gitattributes
 | 
1
-
D
vendor/0001-vcpkg-curl-use-winssl.patch
 | 
23
-----------------------
M
vendor/vcpkg-deps.txt
 | 
2
+-
M
win32.tup
 | 
2
+-

6 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -39,14 +39,13 @@ for:
 
   - matrix: { only: [ image: *windows ] }
     cache:
-      - C:\Tools\vcpkg\installed\
+      - C:\Tools\vcpkg\installed -> vendor\vcpkg-deps.txt
     install:
       - curl -fsSL http://gittup.org/tup/win32/tup-explicit-variant-v0.7.3-45-gcf6a829.zip -o C:\Tools\tup.zip
       - 7z x C:\Tools\tup.zip -oC:\Tools\tup > NUL
       - set PATH=C:\Tools\tup;%PATH%
 
       - mklink /J vendor\vcpkg C:\Tools\vcpkg > NUL
-      - git apply --directory=vendor vendor\0001-vcpkg-curl-use-winssl.patch
       - set /p vcpkg-deps=<vendor\vcpkg-deps.txt
       - vcpkg install --triplet %PLATFORM%-windows-static %vcpkg-deps%
     build_script: tup %PLATFORM%
diff --git a/README.md b/README.md
@@ -81,7 +81,6 @@ Clone [vcpkg](https://github.com/Microsoft/vcpkg) into `vendor` and install
 the build dependencies:
 
     git clone https://github.com/Microsoft/vcpkg.git vendor\vcpkg
-    git apply --directory=vendor vendor\0001-vcpkg-curl-use-winssl.patch
     vendor\vcpkg\bootstrap-vcpkg.bat
 
     set /p vcpkg-deps=<vendor\vcpkg-deps.txt
diff --git a/vendor/.gitattributes b/vendor/.gitattributes
@@ -1 +0,0 @@
-*.patch -text
diff --git a/vendor/0001-vcpkg-curl-use-winssl.patch b/vendor/0001-vcpkg-curl-use-winssl.patch
@@ -1,23 +0,0 @@
-diff --git a/vcpkg/triplets/x64-windows-static.cmake b/vcpkg/triplets/x64-windows-static.cmake
-index 75f9b953..0f828565 100644
---- a/vcpkg/triplets/x64-windows-static.cmake
-+++ b/vcpkg/triplets/x64-windows-static.cmake
-@@ -1,3 +1,4 @@
- set(VCPKG_TARGET_ARCHITECTURE x64)
- set(VCPKG_CRT_LINKAGE static)
- set(VCPKG_LIBRARY_LINKAGE static)
-+set(CURL_USE_WINSSL ON)
-diff --git a/vcpkg/triplets/x86-windows-static.cmake b/vcpkg/triplets/x86-windows-static.cmake
-index c855f0ca..afd1246d 100644
---- a/vcpkg/triplets/x86-windows-static.cmake
-+++ b/vcpkg/triplets/x86-windows-static.cmake
-@@ -1,3 +1,4 @@
- set(VCPKG_TARGET_ARCHITECTURE x86)
- set(VCPKG_CRT_LINKAGE static)
--set(VCPKG_LIBRARY_LINKAGE static)
-\ No newline at end of file
-+set(VCPKG_LIBRARY_LINKAGE static)
-+set(CURL_USE_WINSSL ON)
--- 
-2.18.0.windows.1
-
diff --git a/vendor/vcpkg-deps.txt b/vendor/vcpkg-deps.txt
@@ -1 +1 @@
-boost-algorithm boost-core boost-lexical-cast boost-logic boost-preprocessor boost-range catch2 curl sqlite3
+boost-algorithm boost-core boost-lexical-cast boost-logic boost-math boost-preprocessor boost-range catch2 curl[non-http] sqlite3
diff --git a/win32.tup b/win32.tup
@@ -16,7 +16,7 @@ CXXFLAGS += /DNDEBUG /DREAPACK_FILE#\"$(REAPACK_FILE).dll\"
 
 LD := $(WRAP) link
 LDFLAGS := /nologo User32.lib Shell32.lib Gdi32.lib Comdlg32.lib Comctl32.lib Bcrypt.lib
-LDFLAGS += $(VCPKG)/lib/libcurl.lib Ws2_32.lib Crypt32.lib Advapi32.lib
+LDFLAGS += $(VCPKG)/lib/libcurl.lib Ws2_32.lib Wldap32.lib Crypt32.lib Advapi32.lib
 LDFLAGS += $(VCPKG)/lib/sqlite3.lib $(VCPKG)/lib/zlib.lib
 LDFLAGS += $(TUP_VARIANTDIR)/src/resource.res
 LDFLAGS += /DEBUG /OPT:REF /PDBALTPATH:%_PDB%