Commits

Anonymous committed 4a5e65c

#i100000# workaround for MS linker: splitted lib

Comments (0)

Files changed (1)

svx/util/makefile.mk

 	$(SLB)$/fmcomp-core.lib \
 	$(SLB)$/form-core.lib \
 	$(SLB)$/gal.lib \
-	$(SLB)$/items-core.lib \
+    $(SLB)$/items-core.lib \
 	$(SLB)$/msfilter-core.lib \
-	$(SLB)$/options-core.lib   \
+	$(SLB)$/options-core.lib
+
+LIB6TARGET= $(SLB)$/$(TARGET)_6.lib
+LIB6FILES=\
 	$(SLB)$/outliner.lib \
 	$(SLB)$/overlay.lib \
 	$(SLB)$/primitive2d.lib \
 	$(SLB)$/xout.lib
 
 # Objects needed for the svxmsfilter library.
-LIB6TARGET= $(SLB)$/$(TARGET)_6.lib
-LIB6FILES=\
+LIB7TARGET= $(SLB)$/$(TARGET)_7.lib
+LIB7FILES=\
 	$(SLB)$/msfilter-msfilter.lib \
 	$(SLB)$/svdraw-msfilter.lib \
 	$(SLB)$/svxrtf.lib
 SHL1TARGET= svxcore$(DLLPOSTFIX)
 SHL1IMPLIB= isvxcore
 SHL1USE_EXPORTS=name
-SHL1LIBS= $(LIB5TARGET)
+SHL1LIBS= $(LIB5TARGET) $(LIB6TARGET)
 
 SHL1STDLIBS= \
              $(AVMEDIALIB) \
 SHL4IMPLIB= isvxmsfilter
 SHL4USE_EXPORTS=name
 SHL4DEPN=$(SHL1TARGETN)
-SHL4LIBS= $(LIB6TARGET)
+SHL4LIBS= $(LIB7TARGET)
 
 SHL4STDLIBS= \
              $(SVXCORELIB) \