summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-05-29 11:37:26 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-05-29 11:37:52 -0300
commit3e8eb396d7cfec8a96efb78719c0556f1beccf68 (patch)
tree3f6e9adbac4c20989812b338ca7bc3a0b65f568d /platform
parenta5777994cbc06183af7db7d8233434f245d5b089 (diff)
Finalized DynamicFont implementation
-DynamicFont uses Freetype by default -Editor fonts are now scalable thanks to this -Cleaned up documentation browser and added fonts for this
Diffstat (limited to 'platform')
-rw-r--r--platform/windows/detect.py4
-rw-r--r--platform/x11/detect.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 56e8a5d45d..ed0049b362 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -204,8 +204,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'])
if (env["target"]=="release"):
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 6b3f7147ef..5a43bf9323 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -143,8 +143,8 @@ def configure(env):
if (env["freetype"]!="no"):
env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
if (env["freetype"]=="builtin"):
- 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.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED'])