mirror of
https://github.com/3proxy/3proxy.git
synced 2026-04-07 05:40:12 +08:00
fix Makefile.win
This commit is contained in:
parent
c2ba8f2b85
commit
d3f923caba
11
.github/workflows/c-cpp.yml
vendored
11
.github/workflows/c-cpp.yml
vendored
@ -52,13 +52,13 @@ jobs:
|
||||
run: make -f Makefile.FreeBSD clean
|
||||
- name: install Windows libraries
|
||||
if: ${{ startsWith(matrix.target, 'windows') }}
|
||||
run: vcpkg install pcre2:x64-windows openssl:x64-windows && c:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-pcre2 mingw-w64-x86_64-openssl
|
||||
run: vcpkg install pcre2:x64-windows && c:\msys64\usr\bin\pacman.exe -S --noconfirm mingw-w64-x86_64-pcre2 mingw-w64-x86_64-openssl
|
||||
- name: make Windows
|
||||
if: ${{ startsWith(matrix.target, 'windows') }}
|
||||
run: make -f Makefile.win
|
||||
env:
|
||||
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"'
|
||||
LIBS: '-L "c:/msys64/mingw64/lib"'
|
||||
CFLAGS: '-I "c:/msys64/mingw64/include"'
|
||||
- name: make clean Windows
|
||||
if: ${{ startsWith(matrix.target, 'windows') }}
|
||||
run: make -f Makefile.win clean
|
||||
@ -72,11 +72,6 @@ jobs:
|
||||
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
||||
D:
|
||||
cd "D:/a/3proxy/3proxy"
|
||||
dir /S "c:\program files\openssl\lib\"
|
||||
dir "c:\vcpkg\installed\x64-windows\lib"
|
||||
dir /S "c:\msys64\"
|
||||
dir /S "c:\mingw32\"
|
||||
dir /S "c:\mingw64\"
|
||||
mkdir bin64
|
||||
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"
|
||||
|
||||
@ -18,7 +18,7 @@ DLFLAGS ?= -shared
|
||||
DLSUFFICS = .dll
|
||||
LIBS := -lws2_32 -lodbc32 -ladvapi32 -luser32 $(LIBS)
|
||||
LIBSPREFIX = -l
|
||||
LIBSSUFFIX = .lib
|
||||
LIBSSUFFIX =
|
||||
LNOUT = -o
|
||||
EXESUFFICS = .exe
|
||||
OBJSUFFICS = .o
|
||||
|
||||
Loading…
Reference in New Issue
Block a user