From 80860f62b22d9354da864c5c86e7252fd95bdefd Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 25 Mar 2009 10:19:27 -0500 Subject: [PATCH 1/2] remove dead freetype code from Makefile --- Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 5461ea5de9..234b8a2c88 100644 --- a/Makefile +++ b/Makefile @@ -98,17 +98,13 @@ netbsd-x86-32: netbsd-x86-64: $(MAKE) $(EXECUTABLE) CONFIG=vm/Config.netbsd.x86.64 -macosx-freetype: - ln -sf libfreetype.6.dylib \ - Factor.app/Contents/Frameworks/libfreetype.dylib - -macosx-ppc: macosx-freetype +macosx-ppc: $(MAKE) $(EXECUTABLE) macosx.app CONFIG=vm/Config.macosx.ppc -macosx-x86-32: macosx-freetype +macosx-x86-32: $(MAKE) $(EXECUTABLE) macosx.app CONFIG=vm/Config.macosx.x86.32 -macosx-x86-64: macosx-freetype +macosx-x86-64: $(MAKE) $(EXECUTABLE) macosx.app CONFIG=vm/Config.macosx.x86.64 linux-x86-32: From 28b10a709464eb5c3f0183ff29c166904c4a322e Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 25 Mar 2009 10:19:52 -0500 Subject: [PATCH 2/2] remove loading freetype library on CE --- basis/windows/ce/ce.factor | 1 - 1 file changed, 1 deletion(-) diff --git a/basis/windows/ce/ce.factor b/basis/windows/ce/ce.factor index 948612b2b2..18c48a0139 100644 --- a/basis/windows/ce/ce.factor +++ b/basis/windows/ce/ce.factor @@ -10,6 +10,5 @@ USING: alien sequences ; { "libm" "\\windows\\coredll.dll" "stdcall" } ! { "gl" "libGLES_CM.dll" "stdcall" } ! { "glu" "libGLES_CM.dll" "stdcall" } - ! { "freetype" "libfreetype-6.dll" "stdcall" } { "ole32" "ole32.dll" "stdcall" } } [ first3 add-library ] each