From 069d1c00f642f64fda87bf4e3f14d42ddd9cb047 Mon Sep 17 00:00:00 2001 From: Tindy X <49061470+tindy2013@users.noreply.github.com> Date: Tue, 3 Nov 2020 20:01:15 +0800 Subject: [PATCH] Fix linking error --- scripts/build.windows.release.sh | 4 ++-- src/misc.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build.windows.release.sh b/scripts/build.windows.release.sh index 8f2fb53..843e9d0 100644 --- a/scripts/build.windows.release.sh +++ b/scripts/build.windows.release.sh @@ -3,7 +3,7 @@ set -xe git clone https://github.com/curl/curl --depth=1 cd curl -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_USE_LIBSSH2=OFF -DHTTP_ONLY=ON -DCMAKE_USE_SCHANNEL=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_CURL_EXE=OFF -DCMAKE_INSTALL_PREFIX="$MINGW_PREFIX" -G "Unix Makefiles" . +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_USE_LIBSSH2=OFF -DHTTP_ONLY=ON -DCMAKE_USE_SCHANNEL=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_CURL_EXE=OFF -DCMAKE_INSTALL_PREFIX="$MINGW_PREFIX" -G "Unix Makefiles" -DHAVE_LIBIDN2=OFF . make install -j4 cd .. @@ -36,5 +36,5 @@ cd .. cmake -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" . make -j4 rm subconverter.exe -g++ $(find CMakeFiles/subconverter.dir/src -name "*.obj") curl/lib/libcurl.a -o base/subconverter.exe -static -levent -lpcre2-8 -lduktape -lduktape_module -lyaml-cpp -lidn2 -lunistring -liconv -liphlpapi -lcrypt32 -lws2_32 -lwsock32 -lz -s +g++ $(find CMakeFiles/subconverter.dir/src -name "*.obj") curl/lib/libcurl.a -o base/subconverter.exe -static -levent -lpcre2-8 -lduktape -lduktape_module -lyaml-cpp -liphlpapi -lcrypt32 -lws2_32 -lwsock32 -lz -s mv base subconverter \ No newline at end of file diff --git a/src/misc.cpp b/src/misc.cpp index ea3bb71..2209076 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -5,11 +5,11 @@ #include #include #include +#include //#include #include #include #include -#include /* #ifdef USE_STD_REGEX