bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-04-07 05:40:12 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Update Makefile.win

Browse Source
This commit is contained in:
Vladimir Dubrovin 2026-03-30 17:24:33 +03:00
parent e058b56b27
commit 4fa2c07dd1
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.github/workflows/c-cpp.yml vendored
View File

@ -23,33 +23,24 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
# - name: configure # - name: configure
# run: ./configure # run: ./configure
- name: ln Linux
if: ${{ startsWith(matrix.target, 'ubuntu') }}
run: ln -s Makefile.Linux Makefile
- name: Linux libraries - name: Linux libraries
if: ${{ startsWith(matrix.target, 'ubuntu') }} if: ${{ startsWith(matrix.target, 'ubuntu') }}
run: sudo apt install libssl-dev libpam-dev libpcre3 libpcre3-dev run: sudo apt install libssl-dev libpam-dev libpcre3 libpcre3-dev
- name: Mac libraries - name: Mac libraries
if: ${{ startsWith(matrix.target, 'macos') }} if: ${{ startsWith(matrix.target, 'macos') }}
run: brew install pcre run: brew install pcre
- name: ln Mac
if: ${{ startsWith(matrix.target, 'macos') }}
run: ln -s Makefile.FreeBSD Makefile
- name: ln Windows
if: ${{ startsWith(matrix.target, 'windows') }}
run: copy Makefile.win Makefile
- name: make Windows - name: make Windows
if: ${{ startsWith(matrix.target, 'windows') }} if: ${{ startsWith(matrix.target, 'windows') }}
run: make run: make -f Makefile.win
env: env:
LIBS: '-L "c:/program files/openssl/lib/VC/x64/MT"' LIBS: '-L "c:/program files/openssl/lib/VC/x64/MT"'
CFLAGS: '-I "c:/program files/openssl/include"' CFLAGS: '-I "c:/program files/openssl/include"'
- name: make Ubuntu - name: make Ubuntu
if: ${{ startsWith(matrix.target, 'ubuntu') }} if: ${{ startsWith(matrix.target, 'ubuntu') }}
run: make run: make -f Makefile.Linux
- name: make MacOS - name: make MacOS
if: ${{ startsWith(matrix.target, 'macos') }} if: ${{ startsWith(matrix.target, 'macos') }}
run: make run: make -f Makefile.FreeBSD
env: env:
LDFLAGS: "-L/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/openssl/lib" LDFLAGS: "-L/usr/local/lib -L/opt/homebrew/lib -L/opt/homebrew/opt/openssl/lib"
CFLAGS: "-I/usr/local/include -I/opt/homebrew/include -I/usr/local/opt/openssl/include -I/opt/homebrew/opt/openssl/include" CFLAGS: "-I/usr/local/include -I/opt/homebrew/include -I/usr/local/opt/openssl/include -I/opt/homebrew/opt/openssl/include"
@ -59,5 +50,12 @@ jobs:
- name: make install - name: make install
if: ${{ startsWith(matrix.target, 'ubuntu') }} if: ${{ startsWith(matrix.target, 'ubuntu') }}
run: make DESTDIR=~/3proxy install run: make DESTDIR=~/3proxy install
- name: make clean - name: make clean Windows
run: make clean if: ${{ startsWith(matrix.target, 'windows') }}
run: make -f Makefile.win clean
- name: make clean Linux
if: ${{ startsWith(matrix.target, 'ubuntu') }}
run: make -f Makefile.Linux clean
- name: make clean MacOS
if: ${{ startsWith(matrix.target, 'macos') }}
run: make -f Makefile.FreeBSD clean

4
Makefile.win
View File

@ -10,13 +10,13 @@
BUILDDIR = ../bin/ BUILDDIR = ../bin/
CC ?= gcc CC ?= gcc
CFLAGS += -O2 -s -c -mthreads -DWITH_STD_MALLOC -DWITH_WSAPOLL CFLAGS := -O2 -s -c -mthreads -DWITH_STD_MALLOC -DWITH_WSAPOLL $(CFLAGS)
COUT = -o COUT = -o
LN ?= $(CC) LN ?= $(CC)
LDFLAGS ?= -O2 -s -mthreads LDFLAGS ?= -O2 -s -mthreads
DLFLAGS ?= -shared DLFLAGS ?= -shared
DLSUFFICS = .dll DLSUFFICS = .dll
LIBS ?= -lws2_32 -lodbc32 -ladvapi32 -luser32 LIBS := -lws2_32 -lodbc32 -ladvapi32 -luser32 $(LIBS)
LIBSPREFIX = -l LIBSPREFIX = -l
LIBSSUFFIX = LIBSSUFFIX =
LNOUT = -o LNOUT = -o