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 /SConstruct | |
| 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 'SConstruct')
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index dd780409d5..10bf3b3625 100644 --- a/SConstruct +++ b/SConstruct @@ -125,7 +125,7 @@ opts.Add('libtheora','Theora library for theora module (system/builtin)','builti opts.Add('opus','Opus and opusfile library for Opus format support: (system/builtin)','builtin') opts.Add('minizip','Build Minizip Archive Support: (yes/no)','yes') opts.Add('squish','Squish library for BC Texture Compression in editor (system/builtin)','builtin') -opts.Add('freetype','Freetype support in editor','builtin') +opts.Add('freetype','Freetype library for TTF support via freetype module (system/builtin)','builtin') opts.Add('xml','XML Save/Load support (yes/no)','yes') opts.Add('libpng','libpng library for image loader support (system/builtin)','builtin') opts.Add('libwebp','libwebp library for webp module (system/builtin)','builtin') @@ -250,14 +250,6 @@ if selected_platform in platform_list: #must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11) detect.configure(env) - - if (env["freetype"]!="no"): - env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) - if (env["freetype"]=="builtin"): - env.Append(CPPPATH=['#drivers/freetype']) - env.Append(CPPPATH=['#drivers/freetype/freetype/include']) - - #env['platform_libsuffix'] = env['LIBSUFFIX'] suffix="."+selected_platform |