From 6fd2d815174df8274153ddb7e99eab26ab7e563c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 15 Dec 2011 14:32:40 +0100 Subject: fdo#43707: tweak workarounds for fdo#42865: Apparently on Windows the SAL_DLLPUBLIC_EXPORT does not work for unknown reasons, so use the old mapfiles on that platform. Should fix regressions from 1fb5eb21, 48dbaa51, a9da5a0b. --- sdext/source/pdfimport/makefile.mk | 4 ++++ sdext/source/presenter/makefile.mk | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'sdext') diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index 9262ef654dff..641e90fbcc94 100644 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -91,7 +91,11 @@ SHL1STDLIBS=\ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def +.IF "$(GUI)"=="WNT" +SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map +.ELSE # just a quick hack for GCC fdo#42865 SHL1USE_EXPORTS = name +.ENDIF SHL1RPATH=OXT DEF1NAME=$(SHL1TARGET) diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 6d9e5bb6f6c4..7d74d96420a8 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -108,7 +108,11 @@ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def +.IF "$(GUI)"=="WNT" +SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map +.ELSE # just a quick hack for GCC fdo#42865 SHL1USE_EXPORTS = name +.ENDIF SHL1RPATH= OXT DEF1NAME= $(SHL1TARGET) -- cgit