diff options
| author | oisin <oisin@openoffice.org> | 2001-01-31 14:02:44 +0000 |
|---|---|---|
| committer | oisin <oisin@openoffice.org> | 2001-01-31 14:02:44 +0000 |
| commit | 3cf7e64c91cf3dbe9a6ac292a00d62f9797f6b1e (patch) | |
| tree | 4ef1069d544e641ab118afe2ca60221b04ff762b /vcl/util | |
| parent | cf2248d4a72c249f3cfd6052d1b7135b0493b256 (diff) | |
Xprint implementation merged into head
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 33 | ||||
| -rw-r--r-- | vcl/util/target.pmk | 9 |
2 files changed, 32 insertions, 10 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 95c6694c0b22..6b59197ad989 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: oisin $ $Date: 2001-01-23 17:56:11 $ +# last change: $Author: oisin $ $Date: 2001-01-31 15:02:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -559,20 +559,37 @@ $(MISC)$/$(SHL2TARGET).def: $(MISC)$/$(SHL1TARGET).flt \ .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="SOLARIS" -.IF "$(PSPRINT)" == "" -SHL1STDLIBS += -lxp$(UPD)$(DLLPOSTFIX) -lXm -lXt -lX11 +.IF "$(USE_XPRINT)"!="TRUE" .ELSE +CFLAGS+=-D_USE_PRINT_EXTENSION_=1 +.ENDIF + +# Solaris +.IF "$(OS)"=="SOLARIS" + +.IF "$(USE_XPRINT)" == "TRUE" +SHL1STDLIBS += -lXp -lXm -lXt -lX11 +.ELIF "$(PSPRINT)"!="" SHL1STDLIBS += -lXm -lXt -lX11 +.ELSE +SHL1STDLIBS += -lxp$(UPD)$(DLLPOSTFIX) -lXm -lXt -lX11 .ENDIF + +# MacOSX .ELIF "$(OS)"=="MACOSX" SHL1STDLIBS += + +# Others .ELSE -.IF "$(PSPRINT)" == "" -SHL1STDLIBS += -lxp$(UPD)$(DLLPOSTFIX) -lXaw -lXt -lX11 -.ELSE + +.IF "$(USE_XPRINT)" == "TRUE" +SHL1STDLIBS += -lXp -lXaw -lXt -lX11 +.ELIF "$(PSPRINT)"!="" SHL1STDLIBS += -lXaw -lXt -lX11 +.ELSE +SHL1STDLIBS += -lxp$(UPD)$(DLLPOSTFIX) -lXaw -lXt -lX11 .ENDIF + .ENDIF .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" diff --git a/vcl/util/target.pmk b/vcl/util/target.pmk index 56868954b47c..bc9565270431 100644 --- a/vcl/util/target.pmk +++ b/vcl/util/target.pmk @@ -2,9 +2,9 @@ # # $RCSfile: target.pmk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: oisin $ $Date: 2001-01-23 17:58:05 $ +# last change: $Author: oisin $ $Date: 2001-01-31 15:02:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -72,3 +72,8 @@ ONLYDLL .SETDIR=$(PRJ)$/util: $(SLOFILES) dmake debug=t prjpch=t linkinc=t compinc=t ..$/$(OUTPATH)$/bin$/sv$(UPD)$(DLLSUFFIX).dll @echo "READY" +.IF "$(USE_XPRINT)"!="TRUE" +.ELSE +CFLAGS+=-D_USE_PRINT_EXTENSION_=1 +.ENDIF + |