diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-03 00:23:55 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-03 07:45:08 +0100 |
| commit | cc95d4448c6005c3007c8460f09b8be1595eb3c0 (patch) | |
| tree | 91d5e77f5ee1eb3883b1d03e683286bb12948c31 /modules/freetype | |
| parent | cc54189911e47ef1d432521df7d976b818123b1e (diff) | |
scons: Reorder options for clarity
Also prefix all thirdparty-related toggles with `builtin`.
Diffstat (limited to 'modules/freetype')
| -rw-r--r-- | modules/freetype/SCsub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index c68c40265c..87652a3ddf 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -5,7 +5,7 @@ Import('env') # Not building in a separate env as core needs it # Thirdparty source files -if (env["freetype"] != "system"): # builtin +if (env['builtin_freetype'] != 'no'): thirdparty_dir = "#thirdparty/freetype/" thirdparty_sources = [ "src/autofit/autofit.c", @@ -61,7 +61,7 @@ if (env["freetype"] != "system"): # builtin env.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/include"]) # also requires libpng headers - if (env["libpng"] != "system"): # builtin + if (env['builtin_libpng'] != 'no'): env.Append(CPPPATH=["#thirdparty/libpng"]) """ FIXME: Remove this commented code if Windows can handle the monolithic lib |