diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 615c39d..a9f647a 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -74,6 +74,8 @@ jobs: cd "D:/a/3proxy/3proxy" dir /S "c:\program files\openssl\lib\" dir "c:\vcpkg\installed\x64-windows\lib" + dir /S "c:\msys*" + dir /S "c:\mingw*" 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" diff --git a/Makefile.win b/Makefile.win index 4d57e35..bc660b0 100644 --- a/Makefile.win +++ b/Makefile.win @@ -28,7 +28,7 @@ REMOVECOMMAND = rm -f TYPECOMMAND = cat COMPATLIBS = MAKEFILE = Makefile.win -PLUGINS := utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin +PLUGINS := utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin VERFILE := 3proxyres.o $(VERFILE) VERSION := $(VERSION) VERSIONDEP := 3proxyres.o $(VERSIONDEP) diff --git a/src/plugins/PCREPlugin/pcre_plugin.c b/src/plugins/PCREPlugin/pcre_plugin.c index 346aa77..1d09203 100644 --- a/src/plugins/PCREPlugin/pcre_plugin.c +++ b/src/plugins/PCREPlugin/pcre_plugin.c @@ -8,6 +8,7 @@ #include "../../structures.h" #include #define PCRE2_CODE_UNIT_WIDTH 8 +#define PCRE2_STATIC #include #ifdef __cplusplus