2 files changed, 66 insertions, 53 deletions
diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch
new file mode 100644
index 000000000000..b2be0ddfac21
--- /dev/null
+++ b/graphite/graphite_make.patch
@@ -0,0 +1,57 @@
+--- misc/build/graphite2-0.9.2/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
++++ misc/build/graphite2-0.9.2/src/makefile.mk  Fri Mar  4 10:20:30 2011 +0700
+@@ -0,0 +1,53 @@
++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++
++PRJ=..$/..$/..$/..$/..
++
++PRJNAME=libgraphite2_off
++TARGET=graphite2_off
++ENABLE_EXCEPTIONS=FALSE
++LIBTARGET=NO
++
++.INCLUDE : settings.mk
++
++CFLAGS+=-DDISABLE_TRACING -I../include
++.IF "$(debug)" == ""
++CFLAGS+=-O3 -DNDEBUG
++.ENDIF
++
++VMACHINE=call
++.IF "$(COM)"=="GCC"
++VMACHINE=direct
++.ENDIF
++
++SLOFILES= \
++    $(SLO)/$(VMACHINE)_machine.obj \
++    $(SLO)/gr_char_info.obj \
++    $(SLO)/gr_features.obj \
++    $(SLO)/gr_face.obj \
++    $(SLO)/gr_font.obj \
++    $(SLO)/gr_segment.obj \
++    $(SLO)/gr_slot.obj \
++    $(SLO)/CachedFace.obj \
++    $(SLO)/CmapCache.obj \
++    $(SLO)/Code.obj \
++    $(SLO)/Face.obj \
++    $(SLO)/FeatureMap.obj \
++    $(SLO)/Font.obj \
++    $(SLO)/GlyphFace.obj \
++    $(SLO)/GlyphFaceCache.obj \
++    $(SLO)/NameTable.obj \
++    $(SLO)/Pass.obj \
++    $(SLO)/SegCache.obj \
++    $(SLO)/SegCacheEntry.obj \
++    $(SLO)/SegCacheStore.obj \
++    $(SLO)/Segment.obj \
++    $(SLO)/Silf.obj \
++    $(SLO)/Slot.obj \
++    $(SLO)/TtfUtil.obj
++
++LIB1ARCHIV=$(LB)$/lib$(TARGET).a
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1OBJFILES=$(SLOFILES)
++OUT2INC=../include/graphite2
++
++.INCLUDE : target.mk
+
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 299b09e2519d..f2444a75ff19 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -31,7 +31,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 PRJ=.
 
 PRJNAME=graphite
-TARGET=so_graphite
+TARGET=libgraphite
 
 # --- Settings -----------------------------------------------------
 
@@ -47,63 +47,19 @@ all:
 .IF "$(ENABLE_GRAPHITE)"=="TRUE"
 TARFILE_NAME=graphite2-0.9.2
 TARFILE_MD5=0625a7d661f899a8ce263fc8a9879108
-PATCH_FILES= graphite2-0.9.2.patch
+PATCH_FILES= graphite2-0.9.2.patch \
+        graphite_make.patch
 
 # convert line-endings to avoid problems when patching
 CONVERTFILES=
 
-CONFIGURE_DIR=build
+BUILD_DIR=src
+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 
-.IF "$(COM)"=="MSC"
-CMAKE_GENERATOR="NMake Makefiles"
-# make use of stlport headerfiles
-EXT_USE_STLPORT=TRUE
-GR_CMAKE_LINK_FLAGS=-D "CMAKE_SHARED_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_MODULE_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_EXE_LINKER_FLAGS=/STACK:10000000 /machine:x86" -D "CMAKE_SYSTEM_PROCESSOR=x86"
-BUILD_ACTION=nmake
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-CMAKE_GENERATOR="Unix Makefiles"
-GR_CMAKE_LINK_FLAGS=
-.IF "$(OS)"=="WNT"
-#PATCH_FILES+=graphite2.patch.mingw
-.ENDIF
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
-.ENDIF
-
-.IF "$(debug)"=="true"
-CMAKE_BUILD_TYPE=Debug
-.ELSE
-CMAKE_BUILD_TYPE=Release
-.ENDIF
-
-# Don't include STLPORT headers because it interferes with CMake's compiler
-# detection. Graphite2 no longer uses the STL anyway.
-CONFIGURE_ACTION=bash -c 'INCLUDE="$(COMPATH)/Include;$(PSDK_HOME)/Include" CXXFLAGS="$(CFLAGSCXX) $(CDEFS)" LIB="$(ILIB)" cmake -G $(CMAKE_GENERATOR) -D CMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -D ENABLE_COMPARE_RENDERER=0 $(GR_CMAKE_LINK_FLAGS) .. '
-
-
-BUILD_DIR=$(CONFIGURE_DIR)
-
-.IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
-OUT2LIB=build$/src$/*.lib
-OUT2BIN=build$/src$/*.dll
-.ELSE
-.IF "$(OS)"=="MACOSX"
-OUT2LIB+=build$/src$/libgraphite2.*.dylib
-.ELSE
-OUT2LIB=build$/src$/libgraphite2.so.*.*.*
-.ENDIF
-.ENDIF
-
-OUTDIR2INC= \
-    include/graphite2
-
-.ELSE
-dddd:
-    @echo Nothing to do
+OUT2INC_SUBDIR=graphite2
+OUT2INC=include/graphite2/Font.h \
+        include/graphite2/Segment.h \
+        include/graphite2/Types.h
 .ENDIF
 
 # --- Targets ------------------------------------------------------