diff options
| author | Kostadin Damyanov | 2015-10-13 05:01:54 +0300 |
|---|---|---|
| committer | Kostadin Damyanov | 2015-10-13 05:01:54 +0300 |
| commit | 29caf2bb5be061cd1ab014cf938f2c71d0bd2663 (patch) | |
| tree | 859a0c3d2805198672c1e22d4780c3eb68f55a57 /platform/x11/detect.py | |
| parent | c5f574b914b3cb11d97ae616df4a0bced45bb17c (diff) | |
| parent | 79e5ced7e668fa53567ac6aaf5a26393cea6c9a2 (diff) | |
| download | godot-29caf2bb5be061cd1ab014cf938f2c71d0bd2663.tar.gz godot-29caf2bb5be061cd1ab014cf938f2c71d0bd2663.tar.zst godot-29caf2bb5be061cd1ab014cf938f2c71d0bd2663.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index b8890a3a2..9a52a7c92 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -63,7 +63,7 @@ def get_flags(): return [ ('builtin_zlib', 'no'), ("openssl", "yes"), - ("theora","no"), + #("theora","no"), ] @@ -131,8 +131,17 @@ def configure(env): env.ParseConfig('pkg-config openssl --cflags --libs') - env.ParseConfig('pkg-config freetype2 --cflags --libs') - env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) + if (env["freetype"]=="yes"): + env.ParseConfig('pkg-config freetype2 --cflags --libs') + + + if (env["freetype"]!="no"): + env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) + if (env["freetype"]=="builtin"): + env.Append(CPPPATH=['#tools/freetype']) + env.Append(CPPPATH=['#tools/freetype/freetype/include']) + + env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED']) |