diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 11:07:30 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 11:07:30 +0200 |
| commit | fc263c4f068ae706e05d0dc0546400301f381303 (patch) | |
| tree | 11995b3c447fac87ca2e2a263b945d5e815cef13 /writerperfect/util | |
| parent | wpsimport-filter.diff: WPS Import filter - filter module changes (diff) | |
| download | core-fc263c4f068ae706e05d0dc0546400301f381303.tar.gz core-fc263c4f068ae706e05d0dc0546400301f381303.zip | |
wpsimport-writerperfect.diff: WPS Import filter - core implementation.
Diffstat (limited to 'writerperfect/util')
| -rw-r--r-- | writerperfect/util/makefile.mk | 47 |
1 files changed, 42 insertions, 5 deletions
diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk index dca29e005287..56bdfb2c60cb 100644 --- a/writerperfect/util/makefile.mk +++ b/writerperfect/util/makefile.mk @@ -4,18 +4,26 @@ TARGET=writerperfect .INCLUDE : settings.mk -.IF "$(GUI)"=="UNX" + +.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC" + .IF "$(SYSTEM_LIBWPD)" == "YES" LIBWPD=$(LIBWPD_LIBS) .ELSE LIBWPD=-lwpdlib .ENDIF + +.IF "$(SYSTEM_LIBWPS)" == "YES" +LIBWPS=$(LIBWPS_LIBS) .ELSE -.IF "$(GUI)$(COM)"=="WNTGCC" -LIBWPD=-lwpdlib -.ELSE - LIBWPD=$(LIBPRE) wpdlib.lib +LIBWPS=-lwpslib .ENDIF + +.ELSE + +LIBWPD=$(LIBPRE) wpdlib.lib +LIBWPS=$(LIBPRE) wpslib.lib + .ENDIF LIB1TARGET= $(SLB)$/wpft.lib @@ -42,4 +50,33 @@ SHL1LIBS = $(LIB1TARGET) SHL1VERSIONMAP=$(SOLARENV)/src/component.map DEF1NAME=$(SHL1TARGET) + +LIB2TARGET= $(SLB)$/msworks.lib +LIB2FILES= \ + $(SLB)$/stream.lib \ + $(SLB)$/filter.lib \ + $(SLB)$/wpsimp.lib +SHL2LIBS=$(LIB2TARGET) +SHL2STDLIBS+= \ + $(SVLLIB) \ + $(SOTLIB) \ + $(SO2LIB) \ + $(SVTOOLLIB) \ + $(UNOTOOLSLIB) \ + $(TOOLSLIB) \ + $(COMPHELPERLIB) \ + $(UCBHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(SALLIB) \ + $(XMLOFFLIB) \ + $(LIBWPS) \ + $(LIBWPD) + +SHL2TARGET = msworks$(DLLPOSTFIX) +SHL2IMPLIB = i$(SHL2TARGET) +SHL2LIBS = $(LIB2TARGET) +SHL2VERSIONMAP = $(SOLARENV)/src/component.map +DEF2NAME = $(SHL2TARGET) + .INCLUDE : target.mk |