diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 16:10:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 16:10:04 +0000 |
| commit | fae4cfacf1148712a88407fdec4089c4a00ca41e (patch) | |
| tree | 09634a4f211f54afcf39e64138153cf09e152b11 /writerperfect/util | |
| parent | a5099896df42833713c6164479bb08ef9427348f (diff) | |
INTEGRATION: CWS libwpdupgrade (1.3.2); FILE MERGED
2005/02/02 20:44:47 rene 1.3.2.1: upgrade writerperfect to new libwpd API and implement --with-system-libwpd.
Remove old libwpd/ stuff, tarball will come when the actual release happened :-)
Diffstat (limited to 'writerperfect/util')
| -rw-r--r-- | writerperfect/util/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk index 1b04bdcc1102..fd6976ce639d 100644 --- a/writerperfect/util/makefile.mk +++ b/writerperfect/util/makefile.mk @@ -6,9 +6,13 @@ VERSION=$(UPD) .INCLUDE : settings.mk .IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" -LIBWPDSTATIC=-lwpdlib +.IF "$(SYSTEM_LIBWPD)" == "YES" +LIBWPD=$(LIBWPD_LIBS) .ELSE -LIBWPDSTATIC=$(LIBPRE) wpdlib.lib +LIBWPD=-lwpdlib +.ENDIF +.ELSE +LIBWPD=$(LIBPRE) wpdlib.lib .ENDIF LIB1TARGET= $(SLB)$/$(TARGET).lib @@ -30,7 +34,7 @@ SHL1STDLIBS+= \ $(CPPULIB) \ $(SALLIB) \ $(XMLOFFLIB) \ - $(LIBWPDSTATIC) + $(LIBWPD) SHL1TARGET = $(TARGET)$(UPD)$(DLLPOSTFIX) SHL1IMPLIB = i$(SHL1TARGET) |