godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCons: Fix linking system pcre2 on server platform 

Fixes #17245.

(cherry picked from commit e619727e99)
This commit is contained in:
Rémi Verschelde 2018-03-04 13:46:11 +01:00
parent 2ff3b08583
commit eeb7385f02
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/server/detect.py
View File

@ -127,6 +127,11 @@ def configure(env):
if not env['builtin_libogg']: if not env['builtin_libogg']:
env.ParseConfig('pkg-config ogg --cflags --libs') 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 ## Flags
# Linkflags below this line should typically stay the last ones # Linkflags below this line should typically stay the last ones