diff options
Diffstat (limited to 'sc/util')
| -rw-r--r-- | sc/util/makefile.mk | 60 | ||||
| -rw-r--r-- | sc/util/scfilt.map | 6 |
2 files changed, 50 insertions, 16 deletions
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk index 1ba1ffbb102c..106d20bd2b11 100644 --- a/sc/util/makefile.mk +++ b/sc/util/makefile.mk @@ -103,12 +103,6 @@ SHL1STDLIBS= \ SHL1LIBS=$(LIB3TARGET) $(LIB4TARGET) -.IF "$(GUI)"!="UNX" -.IF "$(GUI)$(COM)" != "WNTGCC" -SHL1OBJS= $(SLO)$/scdll.obj -.ENDIF -.ENDIF - SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) DEFLIB1NAME= $(LIB3TARGET:b) $(LIB4TARGET:b) @@ -143,17 +137,8 @@ LIB4TARGET=$(SLB)$/scalc3c.lib LIB4FILES= \ $(SLB)$/data.lib \ $(SLB)$/tool.lib \ - $(SLB)$/dif.lib \ - $(SLB)$/excel.lib \ - $(SLB)$/xcl97.lib \ - $(SLB)$/html.lib \ - $(SLB)$/lotus.lib \ - $(SLB)$/qpro.lib\ - $(SLB)$/rtf.lib \ $(SLB)$/xml.lib \ - $(SLB)$/accessibility.lib \ - $(SLB)$/ftools.lib \ - $(SLB)$/scflt.lib + $(SLB)$/accessibility.lib SHL2TARGET= scd$(DLLPOSTFIX) SHL2IMPLIB= scdimp @@ -177,6 +162,49 @@ SHL2OBJS= $(SLO)$/scdetect.obj \ $(SLO)$/detreg.obj SHL2DEPN+= makefile.mk +# split out filters +SHL6TARGET= scfilt$(DLLPOSTFIX) +SHL6IMPLIB= scfiltimp +SHL6LIBS= \ + $(SLB)$/ftools.lib \ + $(SLB)$/excel.lib \ + $(SLB)$/xcl97.lib \ + $(SLB)$/lotus.lib \ + $(SLB)$/qpro.lib \ + $(SLB)$/dif.lib \ + $(SLB)$/html.lib \ + $(SLB)$/rtf.lib \ + $(SLB)$/scflt.lib +SHL6VERSIONMAP= scfilt.map +SHL6DEF=$(MISC)$/$(SHL6TARGET).def +DEF6NAME= $(SHL6TARGET) +SHL6DEPN=$(SHL1TARGETN) +SHL6STDLIBS= \ + $(ISCLIB) \ + $(BASICLIB) \ + $(SFXLIB) \ + $(SVTOOLLIB) \ + $(SVLLIB) \ + $(SVXLIB) \ + $(GOODIESLIB) \ + $(BASEGFXLIB) \ + $(VCLLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(COMPHELPERLIB) \ + $(UCBHELPERLIB) \ + $(TKLIB) \ + $(VOSLIB) \ + $(SALLIB) \ + $(TOOLSLIB) \ + $(I18NISOLANGLIB) \ + $(UNOTOOLSLIB) \ + $(SOTLIB) \ + $(XMLOFFLIB) \ + $(DBTOOLSLIB) \ + $(AVMEDIALIB) \ + $(OOXLIB) \ + $(SAXLIB) # add for scui SHL8TARGET= scui$(DLLPOSTFIX) diff --git a/sc/util/scfilt.map b/sc/util/scfilt.map new file mode 100644 index 000000000000..589736f24eb1 --- /dev/null +++ b/sc/util/scfilt.map @@ -0,0 +1,6 @@ +SCFILT_1_0 { + global: + ScFilterCreate; + local: + *; +}; |