diff --git a/extensions/regex/AMBuilder b/extensions/regex/AMBuilder index 747b120b..e60ef9a7 100644 --- a/extensions/regex/AMBuilder +++ b/extensions/regex/AMBuilder @@ -17,7 +17,10 @@ for arch in SM.archs: elif arch == 'x64': path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_linux64', 'libpcre.a') elif builder.target.platform == 'windows': - path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_win', 'pcre.lib') + if arch == 'x86': + path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_win', 'pcre.lib') + elif arch == 'x64': + path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_win64', 'pcre.lib') elif builder.target.platform == 'mac': if arch == 'x86': path = os.path.join(builder.sourcePath, 'extensions', 'regex', 'lib_darwin', 'libpcre.a') diff --git a/extensions/regex/README.md b/extensions/regex/README.md new file mode 100644 index 00000000..1e66f81f --- /dev/null +++ b/extensions/regex/README.md @@ -0,0 +1,8 @@ +# PCRE Build Instructions +As of writing, we're using pcre v8.32 + +## Windows +We build with the MinSizeForRelease VS configuration using the target architecture you want. This is how both win libs are built. The following settings were selected in the CMAKE configuration +![AenKaUByp0](https://user-images.githubusercontent.com/11095737/87211804-10db1200-c2d0-11ea-85d9-ede4ba177de1.png) + +In the PCRE project, go to C/C++ configuration properties and select the Runtime Library to be Multi-threaded (`/MT`) instead of Multi-threaded DLL (`/MD`) diff --git a/extensions/regex/lib_win64/pcre.lib b/extensions/regex/lib_win64/pcre.lib new file mode 100644 index 00000000..2520ff41 Binary files /dev/null and b/extensions/regex/lib_win64/pcre.lib differ