FreeType: Remove unnecessary subfolder

Also sort sources alphabetically for clarity.

drivers/freetype/SCsub

@@ -1,50 +1,49 @@
 Import('env')
 
 ft_sources=[\
-"freetype/src/pfr/pfr.c",\
-"freetype/src/psaux/psaux.c",\
-"freetype/src/pcf/pcf.c",\
-"freetype/src/otvalid/otvalid.c",\
-"freetype/src/raster/raster.c",\
-"freetype/src/type1/type1.c",\
-"freetype/src/pshinter/pshinter.c",\
-"freetype/src/cff/cff.c",\
-"freetype/src/truetype/truetype.c",\
-"freetype/src/bdf/bdf.c",\
-"freetype/src/cache/ftcache.c",\
-"freetype/src/sfnt/sfnt.c",\
-"freetype/src/winfonts/winfnt.c",\
-"freetype/src/psnames/psnames.c",\
-"freetype/src/cid/type1cid.c",\
-"freetype/src/autofit/autofit.c",\
-"freetype/src/gxvalid/gxvalid.c",\
-"freetype/src/smooth/smooth.c",\
-"freetype/src/type42/type42.c",\
-"freetype/src/base/ftapi.c",\
-"freetype/src/base/ftbase.c",\
-"freetype/src/base/ftbbox.c",\
-"freetype/src/base/ftbdf.c",\
-"freetype/src/base/ftbitmap.c",\
-"freetype/src/base/ftcid.c",\
-"freetype/src/base/ftdebug.c",\
-"freetype/src/base/ftfstype.c",\
-"freetype/src/base/ftgasp.c",\
-"freetype/src/base/ftglyph.c",\
-"freetype/src/base/ftgxval.c",\
-"freetype/src/base/ftinit.c",\
-"freetype/src/base/ftlcdfil.c",\
-"freetype/src/base/ftmm.c",\
-"freetype/src/base/ftotval.c",\
-"freetype/src/base/ftpatent.c",\
-"freetype/src/base/ftpfr.c",\
-"freetype/src/base/ftpic.c",\
-"freetype/src/base/ftstroke.c",\
-"freetype/src/base/ftsynth.c",\
-"freetype/src/base/ftsystem.c",\
-"freetype/src/base/fttype1.c",\
-"freetype/src/base/ftwinfnt.c",\
-"freetype/src/base/ftxf86.c",\
-
+"src/autofit/autofit.c",\
+"src/base/ftapi.c",\
+"src/base/ftbase.c",\
+"src/base/ftbbox.c",\
+"src/base/ftbdf.c",\
+"src/base/ftbitmap.c",\
+"src/base/ftcid.c",\
+"src/base/ftdebug.c",\
+"src/base/ftfstype.c",\
+"src/base/ftgasp.c",\
+"src/base/ftglyph.c",\
+"src/base/ftgxval.c",\
+"src/base/ftinit.c",\
+"src/base/ftlcdfil.c",\
+"src/base/ftmm.c",\
+"src/base/ftotval.c",\
+"src/base/ftpatent.c",\
+"src/base/ftpfr.c",\
+"src/base/ftpic.c",\
+"src/base/ftstroke.c",\
+"src/base/ftsynth.c",\
+"src/base/ftsystem.c",\
+"src/base/fttype1.c",\
+"src/base/ftwinfnt.c",\
+"src/base/ftxf86.c",\
+"src/bdf/bdf.c",\
+"src/cache/ftcache.c",\
+"src/cff/cff.c",\
+"src/cid/type1cid.c",\
+"src/gxvalid/gxvalid.c",\
+"src/otvalid/otvalid.c",\
+"src/pcf/pcf.c",\
+"src/pfr/pfr.c",\
+"src/psaux/psaux.c",\
+"src/pshinter/pshinter.c",\
+"src/psnames/psnames.c",\
+"src/raster/raster.c",\
+"src/sfnt/sfnt.c",\
+"src/smooth/smooth.c",\
+"src/truetype/truetype.c",\
+"src/type1/type1.c",\
+"src/type42/type42.c",\
+"src/winfonts/winfnt.c",\
 ]
 
 
@@ -53,7 +52,7 @@ if (env["freetype"]=="builtin"):
 	half1=[]
 	half2=[]
 	for x in ft_sources:
-		if (x.find("freetype/src/base")==0 or x.find("freetype/src/sfnt")==0):
+		if (x.find("src/base")==0 or x.find("src/sfnt")==0):
 			half2.append(x)
 		else:
 			half1.append(x)
@@ -63,7 +62,7 @@ if (env["freetype"]=="builtin"):
 	lib = env.Library("freetype_builtin2",half1)
 	env.Append(LIBS=[lib])
 
-	env.Append(CPPPATH=["#drivers/freetype/freetype/include"])
+	env.Append(CPPPATH=["#drivers/freetype/include"])
 
 
 Export('env')