diff options
| author | Matthias Huetsch <mhu@openoffice.org> | 2002-09-01 17:22:39 +0000 |
|---|---|---|
| committer | Matthias Huetsch <mhu@openoffice.org> | 2002-09-01 17:22:39 +0000 |
| commit | 2ce65a5251c9496afdbd8848ff004fc8763fbe83 (patch) | |
| tree | 6733e74c058ce11ef0bc0db4ce7860cc67ba8f90 /salhelper/source | |
| parent | a2fedc0a036ced321577e7393c1fde65e4169ed6 (diff) | |
#102715# Fixed C++ library versioning (UNIXVERSIONNAMES=UDK).
Diffstat (limited to 'salhelper/source')
| -rw-r--r-- | salhelper/source/makefile.mk | 40 | ||||
| -rw-r--r-- | salhelper/source/sols.map | 13 |
2 files changed, 32 insertions, 21 deletions
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk index e7caf930e269..b42065f6bc81 100644 --- a/salhelper/source/makefile.mk +++ b/salhelper/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: hr $ $Date: 2001-11-14 13:19:21 $ +# last change: $Author: mhu $ $Date: 2002-09-01 18:22:39 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -61,38 +61,43 @@ #************************************************************************* PRJ=.. -PRJNAME= salhelper -TARGET= salhelper -NO_BSYMBOLIC= TRUE +PRJNAME=salhelper +TARGET=salhelper + ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE= TRUE +NO_BSYMBOLIC=TRUE +USE_DEFFILE=TRUE + +.IF "$(OS)" != "WNT" +UNIXVERSIONNAMES=UDK +.ENDIF # WNT # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk - -# --- Files -------------------------------------------------------- -#RTTI on .IF "$(OS)" == "WNT" -CFLAGS+= -GR -.ENDIF +CFLAGS+= -GR # enable RTTI +.ENDIF # WNT + +# --- Files -------------------------------------------------------- SLOFILES= \ $(SLO)$/dynload.obj \ - $(SLO)$/simplereferenceobject.obj + $(SLO)$/simplereferenceobject.obj # SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols .IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" SLOFILES+=$(SLO)$/staticmb.obj .ENDIF -SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) +.IF "$(UNIXVERSIONNAMES)" != "" +SHL1TARGET= $(TARGET)$(COMID) +.ELSE +SHL1TARGET= $(TARGET)$(UDK_MAJOR)$(COMID) +.ENDIF # UNIXVERSIONNAMES -SHL1STDLIBS= \ - $(SALLIB) +SHL1STDLIBS=$(SALLIB) SHL1DEPN= SHL1IMPLIB= i$(TARGET) @@ -111,7 +116,6 @@ SHL1VERSIONMAP=lngi.map SHL1VERSIONMAP=gcc3_linux_intel.map .ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/salhelper/source/sols.map b/salhelper/source/sols.map index 7c6ec3c93d9e..7606e1beae74 100644 --- a/salhelper/source/sols.map +++ b/salhelper/source/sols.map @@ -1,8 +1,7 @@ -SALHLP_1_0 { +UDK_3.0 { global: GetVersionInfo; -_fini; -_init; +component_getDescriptionFunc; __1cJsalhelperSORealDynamicLoaderLnewInstance6Fpp1rknDrtlIOUString_7_2_; __1cJsalhelperSORealDynamicLoader2t5B6Mpp1rknDrtlIOUString_7pv8_v_; __1cJsalhelperSORealDynamicLoader2t6Mpp1rknDrtlIOUString_7pv8_v_; @@ -27,4 +26,12 @@ __1cJsalhelperbT__RTTI__1CpnJsalhelperVSimpleReferenceObject__; __1cJsalhelperbU__RTTI__1CpknJsalhelperVSimpleReferenceObject__; local: *; +} SALHLP_1_0; + +SALHLP_1_0 { # WEAK (backward compatibility, should have been UDK_3.0) +}; + +{ # BASE +_init; +_fini; }; |