diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-14 21:57:43 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 18:10:17 +0200 |
| commit | edbc0c0d0bed169b3c07ef0f504b97936f0dab37 (patch) | |
| tree | a59bc0448e8f43ce047a0637adc0765b07b05ae0 /platform | |
| parent | e6dc51a0f764dcd7cd07482c022c1e92e6a4da3d (diff) | |
freetype: Make it a module and split thirdparty library
Comment out the weird workaround for building on Windows at it might
not be needed anymore. Testing needed to confirm.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/detect.py | 4 | ||||
| -rw-r--r-- | platform/x11/detect.py | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 2ade097893..8d8e882527 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -80,10 +80,6 @@ def configure(env): env['AS'] = basecmd+"as" -# env.Append(CPPPATH=['#platform/osx/include/freetype2', '#platform/osx/include']) -# env.Append(LIBPATH=['#platform/osx/lib']) - - env.Append(CPPFLAGS=["-DAPPLE_STYLE_KEYS"]) env.Append(CPPFLAGS=['-DUNIX_ENABLED','-DGLES2_ENABLED','-DOSX_ENABLED']) env.Append(LIBS=['pthread']) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 0c14c29361..92bc58d7b0 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -69,7 +69,7 @@ def get_flags(): return [ ("openssl", "system"), - ('freetype','yes'), # use system freetype + ('freetype', 'system'), ('libpng', 'system'), ] @@ -140,15 +140,16 @@ def configure(env): if (env["openssl"] == "system"): env.ParseConfig('pkg-config openssl --cflags --libs') - if (env["libpng"] == "system"): - env.ParseConfig('pkg-config libpng --cflags --libs') - if (env["libwebp"] == "system"): env.ParseConfig('pkg-config libwebp --cflags --libs') - if (env["freetype"]=="yes"): + if (env["freetype"] == "system"): + env["libpng"] = "system" # Freetype links against libpng env.ParseConfig('pkg-config freetype2 --cflags --libs') + if (env["libpng"] == "system"): + env.ParseConfig('pkg-config libpng --cflags --libs') + if (env["enet"] == "system"): env.ParseConfig('pkg-config libenet --cflags --libs') |