godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-18 14:21:41 +00:00
Code Releases Wiki Activity

freetype: Make it a module and split thirdparty library

Browse Source 
Comment out the weird workaround for building on Windows at it might
not be needed anymore. Testing needed to confirm.

(cherry picked from commit edbc0c0d0b)
This commit is contained in:
Rémi Verschelde
2016-10-14 21:57:43 +02:00
parent 8bf3bc3449
commit d96842b80e
509 changed files with 177 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/x11/detect.py
View File

@@ -69,7 +69,7 @@ def get_flags():
return [
("openssl", "system"),
('freetype','yes'), # use system freetype
('freetype', 'system'),
('libpng', 'system'),
]
@@ -140,16 +140,15 @@ 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["squish"] == "system" and env["tools"] == "yes"):
env.ParseConfig('pkg-config libsquish --cflags --libs')