diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-09 21:28:07 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-09 21:28:07 -0300 |
| commit | 94a6ff3d7a2ff770e32a68ac76771639e5a22665 (patch) | |
| tree | 4d6c3fdf78c1ac63382c8c5198e952931e6a2556 /SConstruct | |
| parent | d02261fc844b54ee5a1aa96ef675ee3b3c672744 (diff) | |
-make freetype build for all platforms the same, default as builtin except on x11.
closes #5119
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 0f9b046e2b..038d42f946 100644 --- a/SConstruct +++ b/SConstruct @@ -123,7 +123,7 @@ opts.Add('minizip','Build Minizip Archive Support: (yes/no)','yes') opts.Add('squish','Squish BC Texture Compression in editor (yes/no)','yes') opts.Add('theora','Theora Video (yes/no)','yes') opts.Add('theoralib','Theora Video (yes/no)','no') -opts.Add('freetype','Freetype support in editor','yes') +opts.Add('freetype','Freetype support in editor','builtin') opts.Add('speex','Speex Audio (yes/no)','yes') opts.Add('xml','XML Save/Load support (yes/no)','yes') opts.Add('png','PNG Image loader support (yes/no)','yes') @@ -190,6 +190,7 @@ elif env_base['p'] != "": env_base["platform"]=selected_platform + if selected_platform in platform_list: sys.path.append("./platform/"+selected_platform) @@ -246,6 +247,14 @@ 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 |