diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ceea0e5..082d378 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -107,6 +107,7 @@ jobs: with: update: true install: base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2 python2 python2-pip + msystem: MINGW32 - name: Build run: | git clone https://github.com/curl/curl --depth=1 diff --git a/scripts/build.windows.release.sh b/scripts/build.windows.release.sh index a8c56a8..600d42f 100644 --- a/scripts/build.windows.release.sh +++ b/scripts/build.windows.release.sh @@ -3,13 +3,13 @@ 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 -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=/usr -G "Unix Makefiles" . make install -j4 cd .. git clone https://github.com/jbeder/yaml-cpp --depth=1 cd yaml-cpp -cmake -DCMAKE_BUILD_TYPE=Release -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF -G "Unix Makefiles" . +cmake -DCMAKE_BUILD_TYPE=Release -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF -DCMAKE_INSTALL_PREFIX=/usr -G "Unix Makefiles" . make install -j4 cd .. @@ -30,7 +30,7 @@ cd ../../../.. git clone https://github.com/Tencent/rapidjson --depth=1 cd rapidjson -cmake -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF -G "Unix Makefiles" . +cmake -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=/usr -G "Unix Makefiles" . make install -j4 cd .. @@ -38,4 +38,4 @@ 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 -lcrypt32 -lws2_32 -lwsock32 -lz -s -mv base subconverter +mv base subconverter \ No newline at end of file