diff options
Diffstat (limited to 'graphite/graphite_make.patch')
| -rw-r--r-- | graphite/graphite_make.patch | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch index f28ed6da8ff7..73b62055df7e 100644 --- a/graphite/graphite_make.patch +++ b/graphite/graphite_make.patch @@ -1,6 +1,6 @@ ---- 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 -@@ -1,1 +1,54 @@ +--- misc/build/graphite2-1.0.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 ++++ misc/build/graphite2-1.0.2/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 +@@ -1,1 +1,34 @@ -dummy +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE + @@ -18,37 +18,17 @@ +CFLAGS+=-O3 -DNDEBUG +.ENDIF + -+VMACHINE=call ++_NS := GR2 ++ ++GR2_MACHINE=call +.IF "$(COM)"=="GCC" -+VMACHINE=direct ++GR2_MACHINE=direct +CFLAGSCXX+=-fpermissive +.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 ++.INCLUDE : files.mk ++ ++SLOFILES= $(foreach,i,$(GR2_SOURCES:b) $(SLO)/$i.obj) + +LIB1ARCHIV=$(LB)$/lib$(TARGET).a +LIB1TARGET=$(SLB)$/$(TARGET).lib @@ -56,4 +36,3 @@ +OUT2INC=../include/graphite2 + +.INCLUDE : target.mk - |