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 from1fb5eb21
,48dbaa51
,a9da5a0b
.
This commit is contained in:
@@ -85,7 +85,11 @@ SLOFILES=\
|
||||
|
||||
# --- MOZAB BASE Library -----------------------------------
|
||||
|
||||
.IF "$(GUI)"=="WNT"
|
||||
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
|
||||
.ELSE # just a quick hack for GCC fdo#42865
|
||||
SHL1USE_EXPORTS = name
|
||||
.ENDIF
|
||||
SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
|
||||
SHL1OBJS=$(SLOFILES)
|
||||
SHL1STDLIBS=\
|
||||
@@ -145,7 +149,11 @@ DEPOBJFILES=$(SLO2FILES)
|
||||
|
||||
# --- MOZAB BASE Library -----------------------------------
|
||||
|
||||
.IF "$(GUI)"=="WNT"
|
||||
SHL2VERSIONMAP=$(TARGET2).map
|
||||
.ELSE # just a quick hack for GCC fdo#42865
|
||||
SHL2USE_EXPORTS = name
|
||||
.ENDIF
|
||||
SHL2NOCHECK=TRUE
|
||||
SHL2TARGET= $(TARGET2)$(DLLPOSTFIX)
|
||||
SHL2OBJS=$(SLO2FILES)
|
||||
|
8
connectivity/source/drivers/mozab/mozabdrv.map
Normal file
8
connectivity/source/drivers/mozab/mozabdrv.map
Normal file
@@ -0,0 +1,8 @@
|
||||
UDK_3_0_0 {
|
||||
global:
|
||||
OMozabConnection_CreateInstance;
|
||||
OMozillaBootstrap_CreateInstance;
|
||||
setMozabServiceFactory;
|
||||
local:
|
||||
*;
|
||||
};
|
@@ -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)
|
||||
|
@@ -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)
|
||||
|
||||
|
@@ -70,7 +70,11 @@ SHL1STDLIBS = \
|
||||
|
||||
SHL1TARGET = $(TARGET)
|
||||
|
||||
.IF "$(GUI)"=="WNT"
|
||||
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
|
||||
.ELSE # just a quick hack for GCC fdo#42865
|
||||
SHL1USE_EXPORTS = name
|
||||
.ENDIF
|
||||
SHL1DEPN =
|
||||
SHL1IMPLIB = i$(TARGET)
|
||||
SHL1LIBS = $(SLB)$/$(TARGET).lib
|
||||
|
Reference in New Issue
Block a user