diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-08-24 08:32:58 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-08-24 08:32:58 +0000 |
| commit | 5ea40891ed6708bf138680f72e55ef16bc3c7816 (patch) | |
| tree | 78066d896a4b462bca8446bc9806dbfeeb589a26 /graphite | |
| parent | 24252f3e2f1875347ba98c7f9874dd8d93880b57 (diff) | |
#i10000# build fix
Diffstat (limited to 'graphite')
| -rw-r--r-- | graphite/makefile.mk | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 12086bc0bed4..8b673709a971 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -2,8 +2,6 @@ # # $RCSfile: graphite-makefile-mk.diff,v $ # -# last change: $Author: rodo $ $Date: 2006/01/03 17:58:01 $ -# # The Contents of this file are made available subject to the terms of # either of the following licenses # @@ -71,13 +69,9 @@ TARGET=so_graphite .INCLUDE : settings.mk # --- Files -------------------------------------------------------- -.IF "$(OS)"=="WNT" || "$(OS)"=="LINUX" +.IF "$(ENABLE_GRAPHITE)"=="TRUE" TARFILE_NAME=silgraphite-2.3.1 PATCH_FILES=graphite-2.3.1.patch -.ELSE -dummy: - echo Nothing to do for non Linux / Windows here -.ENDIF # convert line-endings to avoid problems when patching CONVERTFILES=\ @@ -99,12 +93,17 @@ VCNUM=8 .ENDIF # make use of stlport headerfiles EXT_USE_STLPORT=TRUE -BUILD_ACTION=nmake +BUILD_ACTION=nmake VERBOSE=1 .IF "$(debug)"=="true" -BUILD_FLAGS= "CFG=DEBUG" "MLIB=MD" /F makefile.vc$(VCNUM) dll -.ELSE -BUILD_FLAGS="MLIB=MD" /F makefile.vc$(VCNUM) dll +BUILD_FLAGS= "CFG=DEBUG" .ENDIF +### convert CFLAGS as cl.exe cannot handle OOO"s generic ones directly +### TODO: use "guw.exe" instead? +ALLCFLAGS= $(CFLAGS) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS) +JUSTASLASH= / +CFLAGS2MSC= $(ALLCFLAGS:s/-Z/$(JUSTASLASH)Z/) +CFLAGS4MSC= $(CFLAGS2MSC:s/ -/ $(JUSTASLASH)/) +BUILD_FLAGS+= "MLIB=MD" "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) dll .ENDIF .IF "$(COM)"=="GCC" @@ -172,7 +171,10 @@ OUTDIR2INC= \ .IF "$(OS)"=="WNT" OUT2INC=wrappers$/win32$/WinFont.h .ENDIF - +.ELSE +dddd: + @echo Nothing to do +.ENDIF # --- Targets ------------------------------------------------------ |