diff options
Diffstat (limited to 'cppu/util')
-rw-r--r-- | cppu/util/makefile.mk | 4 | ||||
-rw-r--r-- | cppu/util/purpenvhelper3MSCX.map | 8 | ||||
-rw-r--r-- | cppu/util/target.pmk | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 2e52c28b5193..8d1003bd4de6 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -60,7 +60,7 @@ SHL1STDLIBS = $(SALLIB) SHL1DEPN= SHL1IMPLIB=i$(TARGET) -.IF "$(OS)"!="FREEBSD" +.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" SHL1DEF=$(MISC)$/$(SHL1TARGET).def .ENDIF @@ -76,6 +76,8 @@ DEF2NAME := $(SHL2TARGET) SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map .ELIF "$(GUI)"=="OS2" SHL2VERSIONMAP:=uno_purpenvhelperwntgcc.map +.ELIF "$(COMNAME)"=="mscx" +SHL2VERSIONMAP:=$(SHL2TARGET)X.map .ELSE SHL2VERSIONMAP:=$(SHL2TARGET).map .ENDIF # "$(GUI)$(COM)"=="WNTGCC" diff --git a/cppu/util/purpenvhelper3MSCX.map b/cppu/util/purpenvhelper3MSCX.map new file mode 100644 index 000000000000..22485191c805 --- /dev/null +++ b/cppu/util/purpenvhelper3MSCX.map @@ -0,0 +1,8 @@ +UDK_3_0_0 { + global: + ?Environment_initWithEnterable@purpenv@helper@cppu@@YAXPEAU_uno_Environment@@PEAVEnterable@3@@Z; + ?createMapping@purpenv@helper@cppu@@YAXPEAPEAU_uno_Mapping@@PEAU_uno_Environment@@1P6AX_NPEAX3PEAU_typelib_TypeDescriptionReference@@PEAU_typelib_MethodParameter@@JPEBU_typelib_TypeDescription@@3QEAPEAXPEAPEAU_uno_Any@@@Z3@Z; + + local: + *; +}; diff --git a/cppu/util/target.pmk b/cppu/util/target.pmk index 3befcb154753..a94ea7c8dafe 100644 --- a/cppu/util/target.pmk +++ b/cppu/util/target.pmk @@ -51,3 +51,7 @@ CFLAGS += -Ob0 .ENDIF .ENDIF + +.IF "$(COM)$(CPU)" == "MSCX" +CFLAGS += -DCPPU_LEAK_STATIC_DATA +.ENDIF |