diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 64879dc..615c39d 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -50,12 +50,15 @@ jobs: - name: make clean MacOS if: ${{ startsWith(matrix.target, 'macos') }} run: make -f Makefile.FreeBSD clean + - name: install PCRE Windows + if: ${{ startsWith(matrix.target, 'windows') }} + run: vcpkg install pcre2:x64-windows - name: make Windows if: ${{ startsWith(matrix.target, 'windows') }} run: make -f Makefile.win env: - LIBS: '-L "c:/program files/openssl/lib/VC/x64/MT"' - CFLAGS: '-I "c:/program files/openssl/include"' + LIBS: '-L "c:/program files/openssl/lib/VC/x64/MT" -L "c:/vcpkg/installed/x64-windows/lib"' + CFLAGS: '-I "c:/program files/openssl/include" -I "c:/vcpkg/installed/x64-windows/include"' - name: make clean Windows if: ${{ startsWith(matrix.target, 'windows') }} run: make -f Makefile.win clean @@ -69,13 +72,10 @@ jobs: call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" D: cd "D:/a/3proxy/3proxy" - vcpkg install pcre2:x64-windows dir /S "c:\program files\openssl\lib\" dir "c:\vcpkg\installed\x64-windows\lib" mkdir bin64 - set "LIB=%LIB%;c:/program files/openssl/lib/VC/x64/MT" + set "LIB=%LIB%;c:/program files/openssl/lib/VC/x64/MT;c:/vcpkg/installed/x64-windows/lib" + set "INCLUDE=%INCLUDE%;c:/program files/openssl/include;c:/vcpkg/installed/x64-windows/include" nmake /F Makefile.msvc64 nmake /F Makefile.msvc64 clean - env: - LIBS: '/LIBPATH:"c:/program files/openssl/lib/VC/x64/MT"' - CFLAGS: '-I "c:/program files/openssl/include"'