mirror of
https://abf.rosa.ru/djam/godot.git
synced 2025-02-23 18:12:54 +00:00
31 lines
1,019 B
Diff
31 lines
1,019 B
Diff
From eeb7385f02ba4730cf4fd9601b97b3149d2b4ebb Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
|
|
Date: Sun, 4 Mar 2018 13:46:11 +0100
|
|
Subject: [PATCH] SCons: Fix linking system pcre2 on server platform
|
|
|
|
Fixes #17245.
|
|
|
|
(cherry picked from commit e619727e999ecd8e6883330f2c6950cd0624de99)
|
|
---
|
|
platform/server/detect.py | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/platform/server/detect.py b/platform/server/detect.py
|
|
index 77193e592..c3cb76b3c 100644
|
|
--- a/platform/server/detect.py
|
|
+++ b/platform/server/detect.py
|
|
@@ -127,6 +127,11 @@ def configure(env):
|
|
if not env['builtin_libogg']:
|
|
env.ParseConfig('pkg-config ogg --cflags --libs')
|
|
|
|
+ # On Linux wchar_t should be 32-bits
|
|
+ # 16-bit library shouldn't be required due to compiler optimisations
|
|
+ if not env['builtin_pcre2']:
|
|
+ env.ParseConfig('pkg-config libpcre2-32 --cflags --libs')
|
|
+
|
|
## Flags
|
|
|
|
# Linkflags below this line should typically stay the last ones
|
|
--
|
|
2.13.6
|
|
|