diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp index f07b924c5..bed7e04a7 100644 --- a/uppsrc/Core/Core.upp +++ b/uppsrc/Core/Core.upp @@ -3,6 +3,9 @@ description "Non-GUI code. Streams, NTL containers, concrete types, Value, XML, acceptflags USEMALLOC; +uses + plugin\pcre; + uses(WIN32) plugin\z; library(MSC !MSC8ARM) "kernel32 user32"; diff --git a/uppsrc/Core/init b/uppsrc/Core/init index 16c5bbb3f..61cabcd08 100644 --- a/uppsrc/Core/init +++ b/uppsrc/Core/init @@ -1,4 +1,5 @@ #ifndef _Core_icpp_init_stub #define _Core_icpp_init_stub #include "plugin\z/init" +#include "plugin\pcre/init" #endif diff --git a/uppsrc/plugin/pcre/lib.cpp b/uppsrc/plugin/pcre/lib.cpp index c06a3efbd..fad459470 100644 --- a/uppsrc/plugin/pcre/lib.cpp +++ b/uppsrc/plugin/pcre/lib.cpp @@ -1,7 +1,16 @@ -#define SUPPORT_UTF8 +#include + +using namespace Upp; + +#define SUPPORT_UTF8 #define SUPPORT_UCP #define HAVE_CONFIG_H +#define HAVE_STDINT_H 0 +#define HAVE_INTTYPES_H 0 +#define int64_t int64 + + #ifdef COMPILER_GCC #define PCRE_STATIC #endif