mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#43707: tweak workarounds for fdo#42865:

Browse Source 
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.
This commit is contained in:
Michael Stahl
2011-12-15 14:32:40 +01:00
parent e87fc0bfde
commit 6fd2d81517
5 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
connectivity/source/drivers/mozab/makefile.mk
View File

@@ -85,7 +85,11 @@ SLOFILES=\
# --- MOZAB BASE Library ----------------------------------- # --- MOZAB BASE Library -----------------------------------
.IF "$(GUI)"=="WNT"
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
.ELSE # just a quick hack for GCC fdo#42865
SHL1USE_EXPORTS = name SHL1USE_EXPORTS = name
.ENDIF
SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES) SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\ SHL1STDLIBS=\
@@ -145,7 +149,11 @@ DEPOBJFILES=$(SLO2FILES)
# --- MOZAB BASE Library ----------------------------------- # --- MOZAB BASE Library -----------------------------------
.IF "$(GUI)"=="WNT"
SHL2VERSIONMAP=$(TARGET2).map
.ELSE # just a quick hack for GCC fdo#42865
SHL2USE_EXPORTS = name SHL2USE_EXPORTS = name
.ENDIF
SHL2NOCHECK=TRUE SHL2NOCHECK=TRUE
SHL2TARGET= $(TARGET2)$(DLLPOSTFIX) SHL2TARGET= $(TARGET2)$(DLLPOSTFIX)
SHL2OBJS=$(SLO2FILES) SHL2OBJS=$(SLO2FILES)

8
connectivity/source/drivers/mozab/mozabdrv.map Normal file
View File

@@ -0,0 +1,8 @@
UDK_3_0_0 {
global:
OMozabConnection_CreateInstance;
OMozillaBootstrap_CreateInstance;
setMozabServiceFactory;
local:
*;
};

4
sdext/source/pdfimport/makefile.mk
View File

@@ -91,7 +91,11 @@ SHL1STDLIBS=\
SHL1DEPN= SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET) SHL1IMPLIB= i$(SHL1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def 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 SHL1USE_EXPORTS = name
.ENDIF
SHL1RPATH=OXT SHL1RPATH=OXT
DEF1NAME=$(SHL1TARGET) DEF1NAME=$(SHL1TARGET)

4
sdext/source/presenter/makefile.mk
View File

@@ -108,7 +108,11 @@ SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET) SHL1IMPLIB= i$(SHL1TARGET)
SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def 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 SHL1USE_EXPORTS = name
.ENDIF
SHL1RPATH= OXT SHL1RPATH= OXT
DEF1NAME= $(SHL1TARGET) DEF1NAME= $(SHL1TARGET)

4
ucb/source/ucp/cmis/makefile.mk
View File

@@ -70,7 +70,11 @@ SHL1STDLIBS = \
SHL1TARGET = $(TARGET) SHL1TARGET = $(TARGET)
.IF "$(GUI)"=="WNT"
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
.ELSE # just a quick hack for GCC fdo#42865
SHL1USE_EXPORTS = name SHL1USE_EXPORTS = name
.ENDIF
SHL1DEPN = SHL1DEPN =
SHL1IMPLIB = i$(TARGET) SHL1IMPLIB = i$(TARGET)
SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1LIBS = $(SLB)$/$(TARGET).lib