diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-12-15 14:32:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-15 17:24:38 +0100 |
| commit | 7eaf07eea371fadbc48c4d59c8b49bf8daf2eb6a (patch) | |
| tree | 96cc78d7d2fe57ccdb96f7d8b06590f3d84b996a /sdext | |
| parent | 4362f16588dd5937dedd4922af1714aa949ecdba (diff) | |
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.
(cherry picked from commit 5bb7eea39420c79ee72b7559f4e3d90d1abb4994)
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/makefile.mk | 4 | ||||
| -rw-r--r-- | sdext/source/presenter/makefile.mk | 4 |
2 files changed, 8 insertions, 0 deletions
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 a0d8d0f939d6..5606c426c225 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -109,7 +109,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) |