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

x11: Improve logic for cross-dependencies between freetype, zlib and libpng 

Fixes #7373.
This commit is contained in:
Rémi Verschelde 2017-01-08 17:13:30 +01:00
parent ede36aca8d
commit d945c4e58e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
platform/x11/detect.py
View File

@ -139,6 +139,13 @@ def configure(env):
if (env['builtin_libwebp'] == 'no'): if (env['builtin_libwebp'] == 'no'):
env.ParseConfig('pkg-config libwebp --cflags --libs') env.ParseConfig('pkg-config libwebp --cflags --libs')
# freetype depends on libpng and zlib, so bundling one of them while keeping others
# as shared libraries leads to weird issues
if (env['builtin_freetype'] == 'yes' or env['builtin_libpng'] == 'yes' or env['builtin_zlib'] == 'yes'):
env['builtin_freetype'] = 'yes'
env['builtin_libpng'] = 'yes'
env['builtin_zlib'] = 'yes'
if (env['builtin_freetype'] == 'no'): if (env['builtin_freetype'] == 'no'):
env.ParseConfig('pkg-config freetype2 --cflags --libs') env.ParseConfig('pkg-config freetype2 --cflags --libs')
@ -203,10 +210,14 @@ def configure(env):
else: else:
print("PulseAudio development libraries not found, disabling driver") print("PulseAudio development libraries not found, disabling driver")
if (env['builtin_zlib'] == 'no'):
env.ParseConfig('pkg-config zlib --cflags --libs')
env.Append(CPPFLAGS=['-DX11_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL']) env.Append(CPPFLAGS=['-DX11_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
env.Append(LIBS=['GL', 'pthread', 'z']) env.Append(LIBS=['GL', 'pthread'])
if (platform.system() == "Linux"): if (platform.system() == "Linux"):
env.Append(LIBS='dl') env.Append(LIBS=['dl'])
# env.Append(CPPFLAGS=['-DMPC_FIXED_POINT']) # env.Append(CPPFLAGS=['-DMPC_FIXED_POINT'])
# host compiler is default.. # host compiler is default..