From 88cc6ee9d198eac0c53414c192818b171b7cf48f Mon Sep 17 00:00:00 2001 From: Vladimir Dubrovin <3proxy@3proxy.ru> Date: Fri, 3 Apr 2026 11:45:09 +0300 Subject: [PATCH] fix windows makefiles for pcre --- Makefile.msvc64 | 2 +- Makefile.win | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.msvc64 b/Makefile.msvc64 index 3d2fbe1..3a2e8b2 100644 --- a/Makefile.msvc64 +++ b/Makefile.msvc64 @@ -31,7 +31,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.win b/Makefile.win index 65ec8af..655b702 100644 --- a/Makefile.win +++ b/Makefile.win @@ -17,8 +17,8 @@ LDFLAGS ?= -O2 -s -mthreads DLFLAGS ?= -shared DLSUFFICS = .dll LIBS := -lws2_32 -lodbc32 -ladvapi32 -luser32 $(LIBS) -LIBSPREFIX = -l -LIBSSUFFIX = +LIBSPREFIX = lib +LIBSSUFFIX = .lib LNOUT = -o EXESUFFICS = .exe OBJSUFFICS = .o @@ -45,7 +45,7 @@ PAM_CHECK = $(shell echo "\#include \\n int main(){return 0 ifeq ($(PAM_CHECK), true) PLUGINS += PamAuth 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) +PCRE_CHECK = $(shell echo "\#define PCRE2_CODE_UNIT_WIDTH 8\\n#include \\n int main(){return 0;}" | tr -d '\\\\' | cc -x c $(CFLAGS) $(LDFLAGS) pcre2-8.lib -o testpcre - 2>/dev/null && rm testpcre && echo true||echo false) ifeq ($(PCRE_CHECK), true) PLUGINS += PCREPlugin endif