godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-make freetype build for all platforms the same, default as builtin except on x11.

Browse Source 
closes #5119
This commit is contained in:
Juan Linietsky 2016-06-09 21:28:07 -03:00
parent d02261fc84
commit 94a6ff3d7a
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SConstruct
View File

@ -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('squish','Squish BC Texture Compression in editor (yes/no)','yes')
opts.Add('theora','Theora Video (yes/no)','yes') opts.Add('theora','Theora Video (yes/no)','yes')
opts.Add('theoralib','Theora Video (yes/no)','no') 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('speex','Speex Audio (yes/no)','yes')
opts.Add('xml','XML Save/Load support (yes/no)','yes') opts.Add('xml','XML Save/Load support (yes/no)','yes')
opts.Add('png','PNG Image loader 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 env_base["platform"]=selected_platform
if selected_platform in platform_list: if selected_platform in platform_list:
sys.path.append("./platform/"+selected_platform) 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) #must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11)
detect.configure(env) 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'] #env['platform_libsuffix'] = env['LIBSUFFIX']
suffix="."+selected_platform suffix="."+selected_platform

7
platform/osx/detect.py
View File

@ -30,7 +30,6 @@ def get_flags():
return [ return [
('legacygl', 'yes'), ('legacygl', 'yes'),
('builtin_zlib', 'no'), ('builtin_zlib', 'no'),
('freetype','builtin'), #use builtin freetype
('glew', 'yes'), ('glew', 'yes'),
] ]
@ -56,12 +55,6 @@ def configure(env):
env.Append(CCFLAGS=['-g3', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED']) env.Append(CCFLAGS=['-g3', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
if (env["freetype"]!="no"):
env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
env.Append(CPPPATH=['#drivers/freetype'])
env.Append(CPPPATH=['#drivers/freetype/freetype/include'])
if (not os.environ.has_key("OSXCROSS_ROOT")): if (not os.environ.has_key("OSXCROSS_ROOT")):
#regular native build #regular native build

9
platform/windows/detect.py
View File

@ -168,7 +168,6 @@ def get_opts():
def get_flags(): def get_flags():
return [ return [
('freetype','builtin'), #use builtin freetype
('glew','yes'), ('glew','yes'),
('openssl','builtin'), #use builtin openssl ('openssl','builtin'), #use builtin openssl
] ]
@ -203,10 +202,6 @@ def configure(env):
env.Append(CPPPATH=['#platform/windows/include']) env.Append(CPPPATH=['#platform/windows/include'])
env.Append(LIBPATH=['#platform/windows/lib']) env.Append(LIBPATH=['#platform/windows/lib'])
if (env["freetype"]!="no"):
env.Append(CCFLAGS=['/DFREETYPE_ENABLED'])
env.Append(CPPPATH=['#drivers/freetype'])
env.Append(CPPPATH=['#drivers/freetype/freetype/include'])
if (env["target"]=="release"): if (env["target"]=="release"):
@ -350,10 +345,6 @@ def configure(env):
env.Append(CCFLAGS=['-g', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED']) env.Append(CCFLAGS=['-g', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
if (env["freetype"]!="no"):
env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
env.Append(CPPPATH=['#drivers/freetype'])
env.Append(CPPPATH=['#drivers/freetype/freetype/include'])
env["CC"]=mingw_prefix+"gcc" env["CC"]=mingw_prefix+"gcc"

7
platform/x11/detect.py
View File

@ -67,6 +67,8 @@ def get_flags():
('builtin_zlib', 'no'), ('builtin_zlib', 'no'),
('glew', 'yes'), ('glew', 'yes'),
("openssl", "yes"), ("openssl", "yes"),
('freetype','yes'), #use system freetype
#("theora","no"), #("theora","no"),
] ]
@ -141,11 +143,6 @@ def configure(env):
env.ParseConfig('pkg-config freetype2 --cflags --libs') env.ParseConfig('pkg-config freetype2 --cflags --libs')
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.Append(CPPFLAGS=['-DOPENGL_ENABLED']) env.Append(CPPFLAGS=['-DOPENGL_ENABLED'])