Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

fix freetype paths on osx and mingw

Juan Linietsky 9 years ago
parent
3e8eb396d7
commit
65615c0353
2 changed files with 5 additions and 4 deletions
Unified View Show Diff Stats
  1. 2 2
      platform/osx/detect.py
  2. 3 2
      platform/windows/detect.py

+ 2 - 2
platform/osx/detect.py
View File 

@@ -58,8 +58,8 @@ def configure(env):
 
 
 
 	if (env["freetype"]!="no"):
 
 	if (env["freetype"]!="no"):
 
 		env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
 
 		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'])

+ 3 - 2
platform/windows/detect.py
View File 

@@ -352,8 +352,9 @@ def configure(env):
 
 
 
 		if (env["freetype"]!="no"):
 
 		if (env["freetype"]!="no"):
 
 			env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
 
 			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["CC"]=mingw_prefix+"gcc"
 
 		env['AS']=mingw_prefix+"as"
 
 		env['AS']=mingw_prefix+"as"