diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 10f96a9..9f0f52a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -71,9 +71,9 @@ jobs: cd "D:/a/3proxy/3proxy" vcpkg install pcre2:x64-windows 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" 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"' +# LIBS: '/LIBPATH:"c:/program files/openssl/lib/VC/x64/MT" /LIBPATH' + CFLAGS: '-I "c:/program files/openssl/include" -I "c:/vcpkg/installed/x64-windows/include"' diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD index 49c6bae..3854b3a 100644 --- a/Makefile.FreeBSD +++ b/Makefile.FreeBSD @@ -15,8 +15,8 @@ LDFLAGS += -pthread -fno-strict-aliasing # -ldl or -lld may be required for some platforms DCFLAGS ?= -fPIC DLFLAGS ?= -shared -DLSUFFICS = .so LIBS ?= +DLSUFFICS = .so LIBSPREFIX = -l LIBSSUFFIX = LNOUT = -o @@ -32,7 +32,6 @@ MAKEFILE = Makefile.FreeBSD PLUGINS ?= StringsPlugin TrafficPlugin TransparentPlugin OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d \\\\ | cc -x c $(CFLAGS) $(LDFLAGS) -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) - LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d \\\\ | cc -x c $(CFLAGS) $(LDFLAGS) -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) diff --git a/Makefile.Linux b/Makefile.Linux index 732c0f2..7681b4f 100644 --- a/Makefile.Linux +++ b/Makefile.Linux @@ -38,7 +38,6 @@ LIBS ?= -ldl PLUGINS ?= StringsPlugin TrafficPlugin TransparentPlugin OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d \\\\ | cc -x c $(CFLAGS) $(LDFLAGS) -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) - LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif PCRE_CHECK = $(shell echo "\#define PCRE2_CODE_UNIT_WIDTH 8\\n\#include \\n int main(){return 0;}" | tr -d \\\\ | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre2-8 -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false) diff --git a/Makefile.msvc b/Makefile.msvc index 5affb31..7d8a63e 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -14,8 +14,7 @@ LN = link LDFLAGS = /nologo /subsystem:console /incremental:no /machine:I386 DLFLAGS = /DLL DLSUFFICS = .dll -LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib Crypt32.lib libcrypto.lib libssl.lib -LIBSOLD = libeay32MT.lib ssleay32MT.lib +LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib Crypt32.lib LIBSPREFIX = LIBSSUFFIX = .lib LIBEXT = .lib diff --git a/Makefile.msvc64 b/Makefile.msvc64 index 3d2fbe1..dc8a00a 100644 --- a/Makefile.msvc64 +++ b/Makefile.msvc64 @@ -16,8 +16,7 @@ LN = link LDFLAGS = /nologo /subsystem:console /incremental:no /machine:x64 DLFLAGS = /DLL DLSUFFICS = .dll -LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib Crypt32.lib libcrypto.lib libssl.lib $(LIBS) -LIBSOLD = libeay32.lib ssleay32.lib +LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib Crypt32.lib $(LIBS) LIBSPREFIX = LIBSSUFFIX = .lib LIBEXT = .lib @@ -31,7 +30,7 @@ TYPECOMMAND = type COMPATLIBS = VERFILE = 3proxy.res $(VERFILE) VERSIONDEP = 3proxy.res $(VERSIONDEP) -PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin FilePlugin SSLPlugin +PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin FilePlugin SSLPlugin PCREPlugin AFTERCLEAN = del src\*.res include Makefile.inc diff --git a/Makefile.msvcARM64 b/Makefile.msvcARM64 index a892c0d..bda64bc 100644 --- a/Makefile.msvcARM64 +++ b/Makefile.msvcARM64 @@ -14,7 +14,7 @@ LN = link LDFLAGS = /nologo /subsystem:console /incremental:no /machine:arm64 DLFLAGS = /DLL DLSUFFICS = .dll -LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib libcrypto.lib libssl.lib +LIBS = ws2_32.lib advapi32.lib odbc32.lib user32.lib kernel32.lib Gdi32.lib LIBSOLD = LIBSPREFIX = LIBSSUFFIX = .lib diff --git a/Makefile.openwrt-mips b/Makefile.openwrt-mips index 0cbe8f0..2181bb2 100644 --- a/Makefile.openwrt-mips +++ b/Makefile.openwrt-mips @@ -31,14 +31,11 @@ TYPECOMMAND = cat COMPATLIBS = MAKEFILE = Makefile.openwrt-mips # PamAuth requires libpam, you may require pam-devel package to be installed -# SSLPlugin requires -lcrypto -lssl -#LIBS = -lcrypto -lssl -ldl LIBS ?= -ldl #PLUGINS = SSLPlugin StringsPlugin TrafficPlugin PCREPlugin TransparentPlugin PamAuth PLUGINS ?= StringsPlugin TrafficPlugin TransparentPlugin OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d \\\\ | cc -x c $(CFLAGS) $(LDFLAGS) -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) - LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif PCRE_CHECK = $(shell echo "\#define PCRE2_CODE_UNIT_WIDTH 8\\n\#include \\n int main(){return 0;}" | tr -d \\\\ | cc -x c $(CFLAGS) $(LDFLAGS) -l pcre2-8 -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false) diff --git a/Makefile.unix b/Makefile.unix index 6082a79..7b2415b 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -36,7 +36,6 @@ MAKEFILE = Makefile.unix PLUGINS ?= StringsPlugin TrafficPlugin TransparentPlugin OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d \\\\ | cc -x c $(CFLAGS) $(LDFLAGS) -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) - LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d \\\\ | cc -x c $(CFLAGS) $(LDFLAGS) -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) diff --git a/Makefile.win b/Makefile.win index 65ec8af..a7fa6b5 100644 --- a/Makefile.win +++ b/Makefile.win @@ -38,7 +38,6 @@ AFTERCLEAN = (find . -type f -name "*.o" -delete && find . -type f -name "*.res" ifndef OPENSSL_CHECK OPENSSL_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d '\\\\' | cc -x c $(CFLAGS) $(LDFLAGS) -l crypto -l ssl -o testssl - 2>/dev/null && rm testssl && echo true||echo false) ifeq ($(OPENSSL_CHECK), true) - LIBS += -l crypto -l ssl PLUGINS += SSLPlugin endif PAM_CHECK = $(shell echo "\#include \\n int main(){return 0;}" | tr -d '\\\\' | cc -x c $(CFLAGS) $(LDFLAGS) -l pam -o testpam - 2>/dev/null && rm testpam && echo true||echo false) diff --git a/src/plugins/SSLPlugin/Makefile.inc b/src/plugins/SSLPlugin/Makefile.inc index 1afc984..49c013d 100644 --- a/src/plugins/SSLPlugin/Makefile.inc +++ b/src/plugins/SSLPlugin/Makefile.inc @@ -10,5 +10,5 @@ my_ssl$(OBJSUFFICS): my_ssl.c $(BUILDDIR)SSLPlugin$(DLSUFFICS): ssl_plugin$(OBJSUFFICS) my_ssl$(OBJSUFFICS) - $(LN) $(LNOUT)../../$(BUILDDIR)SSLPlugin$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) ssl_plugin$(OBJSUFFICS) my_ssl$(OBJSUFFICS) $(LIBS) + $(LN) $(LNOUT)../../$(BUILDDIR)SSLPlugin$(DLSUFFICS) $(LDFLAGS) $(DLFLAGS) ssl_plugin$(OBJSUFFICS) my_ssl$(OBJSUFFICS) $(LIBPREFIX)crypto$(LIBSUFFIX) $(LIBSPREFIX)ssl$(LIBSSUFFIX) \ No newline at end of file