bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-04-10 23:20:12 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Update workflows and makefiles (5 commits squashed)

Browse Source
This commit is contained in:
Vladimir Dubrovin 2026-03-27 18:04:40 +03:00
parent 28724187fb
commit 1e8130cae8
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,13 +28,16 @@ jobs:
run: ln -s Makefile.Linux Makefile 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 run: sudo apt install libssl-dev libpam-dev libpcre3 libpcre3-dev
- name: Mac libraries
if: ${{ startsWith(matrix.target, 'macos') }}
run: brew install pcre
- name: ln Mac - name: ln Mac
if: ${{ startsWith(matrix.target, 'macos') }} if: ${{ startsWith(matrix.target, 'macos') }}
run: ln -s Makefile.FreeBSD Makefile run: ln -s Makefile.FreeBSD Makefile
- name: Mac variables - name: Mac variables
if: ${{ startsWith(matrix.target, 'macos') }} if: ${{ startsWith(matrix.target, 'macos') }}
run: echo "LDFLAGS=-L/usr/local/opt/openssl/lib -L/opt/homebrew/opt/openssl/lib" >> $GITHUB_ENV && echo "CFLAGS=-I/usr/local/opt/openssl/include -I/opt/homebrew/opt/openssl/include" >> $GITHUB_ENV run: echo "LDFLAGS=-L/usr/local/lib -L/opt/homebrew/lib -L/usr/local/opt/openssl/lib -L/opt/homebrew/opt/openssl/lib" >> $GITHUB_ENV && echo "CFLAGS=-I/usr/local/include -I/opt/homebrew/include -I/usr/local/opt/openssl/include -I/opt/homebrew/opt/openssl/include" >> $GITHUB_ENV
- name: ln Windows - name: ln Windows
if: ${{ startsWith(matrix.target, 'windows') }} if: ${{ startsWith(matrix.target, 'windows') }}
run: copy Makefile.win Makefile run: copy Makefile.win Makefile

2
Makefile.FreeBSD
View File

@ -40,7 +40,7 @@ ifeq ($(PAM_CHECK), true)
PLUGINS += PamAuth PLUGINS += PamAuth
endif endif
PCRE_CHECK = $(shell echo "\#include <pcre.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false) PCRE_CHECK = $(shell echo "\#include <pcre.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false)
ifeq ($(OPENSSL_CHECK), true) ifeq ($(PCRE_CHECK), true)
PLUGINS += PCREPlugin PLUGINS += PCREPlugin
endif endif

2
Makefile.Linux
View File

@ -42,7 +42,7 @@ ifeq ($(OPENSSL_CHECK), true)
PLUGINS += SSLPlugin PLUGINS += SSLPlugin
endif endif
PCRE_CHECK = $(shell echo "#include <pcre.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false) PCRE_CHECK = $(shell echo "#include <pcre.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false)
ifeq ($(OPENSSL_CHECK), true) ifeq ($(PCRE_CHECK), true)
PLUGINS += PCREPlugin PLUGINS += PCREPlugin
endif endif
PAM_CHECK = $(shell echo "#include <security/pam_appl.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) PAM_CHECK = $(shell echo "#include <security/pam_appl.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false)

2
Makefile.openwrt-mips
View File

@ -42,7 +42,7 @@ ifeq ($(OPENSSL_CHECK), true)
PLUGINS += SSLPlugin PLUGINS += SSLPlugin
endif endif
PCRE_CHECK = $(shell echo "#include <pcre.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false) PCRE_CHECK = $(shell echo "#include <pcre.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false)
ifeq ($(OPENSSL_CHECK), true) ifeq ($(PCRE_CHECK), true)
PLUGINS += PCREPlugin PLUGINS += PCREPlugin
endif endif
PAM_CHECK = $(shell echo "#include <security/pam_appl.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) PAM_CHECK = $(shell echo "#include <security/pam_appl.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false)

2
Makefile.unix
View File

@ -44,7 +44,7 @@ ifeq ($(PAM_CHECK), true)
PLUGINS += PamAuth PLUGINS += PamAuth
endif endif
PCRE_CHECK = $(shell echo "\#include <pcre.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false) PCRE_CHECK = $(shell echo "\#include <pcre.h>\\n int main(){return 0;}" | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false)
ifeq ($(OPENSSL_CHECK), true) ifeq ($(PCRE_CHECK), true)
PLUGINS += PCREPlugin PLUGINS += PCREPlugin
endif endif
include Makefile.inc include Makefile.inc