diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-29 12:26:15 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-29 12:26:15 -0300 |
| commit | 65615c03539305d022abf9ac720726bcaefb1d2f (patch) | |
| tree | 630c63b1df350e43884cf3d6c5823f620d3ce163 /platform | |
| parent | 3e8eb396d7cfec8a96efb78719c0556f1beccf68 (diff) | |
fix freetype paths on osx and mingw
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/detect.py | 4 | ||||
| -rw-r--r-- | platform/windows/detect.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 28bc42f6bb..d668509b90 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -58,8 +58,8 @@ def configure(env): if (env["freetype"]!="no"): env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) - env.Append(CPPPATH=['#tools/freetype']) - env.Append(CPPPATH=['#tools/freetype/freetype/include']) + env.Append(CPPPATH=['#drivers/freetype']) + env.Append(CPPPATH=['#drivers/freetype/freetype/include']) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index ed0049b362..97d2461e58 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -352,8 +352,9 @@ def configure(env): if (env["freetype"]!="no"): env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) - env.Append(CPPPATH=['#tools/freetype']) - env.Append(CPPPATH=['#tools/freetype/freetype/include']) + env.Append(CPPPATH=['#drivers/freetype']) + env.Append(CPPPATH=['#drivers/freetype/freetype/include']) + env["CC"]=mingw_prefix+"gcc" env['AS']=mingw_prefix+"as" |