diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-16 09:08:29 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-04-18 16:59:48 +0200 |
| commit | 35e1b53c7e6176315257cae9434ec4364262282c (patch) | |
| tree | 32c349e5d26d2e4475af8ae260bdc29ca4dd17f3 /cppu/util | |
| parent | be6061a954b5f55b20d0e58aa12b425b6505f56e (diff) | |
Remove OS/2 support.
Diffstat (limited to 'cppu/util')
| -rw-r--r-- | cppu/util/extra.mk | 18 | ||||
| -rw-r--r-- | cppu/util/makefile.mk | 4 | ||||
| -rw-r--r-- | cppu/util/makefile.pmk | 4 |
3 files changed, 1 insertions, 25 deletions
diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk index f013516480fc..8c6d6944e0ad 100644 --- a/cppu/util/extra.mk +++ b/cppu/util/extra.mk @@ -44,13 +44,7 @@ SHL3TARGET := unsafe_uno_uno SHL3IMPLIB := i$(SHL3TARGET) SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB) SHL3OBJS := $(SLO)$/UnsafeBridge.obj -.IF "$(GUI)"=="OS2" -SHL3VERSIONMAP=unsafe_os2.map -SHL3DEF=$(MISC)$/$(SHL3TARGET).def -DEF3NAME=$(SHL3TARGET) -.ELSE SHL3DEF := empty.def -.ENDIF SHL3OBJS := $(SLO)$/UnsafeBridge.obj SHL3RPATH := URELIB @@ -58,13 +52,7 @@ SHL4TARGET := affine_uno_uno SHL4IMPLIB := i$(SHL4TARGET) SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB) SHL4OBJS := $(SLO)$/AffineBridge.obj -.IF "$(GUI)"=="OS2" -SHL4VERSIONMAP=unsafe_os2.map -SHL4DEF=$(MISC)$/$(SHL4TARGET).def -DEF4NAME=$(SHL4TARGET) -.ELSE SHL4DEF := empty.def -.ENDIF SHL4OBJS := $(SLO)$/AffineBridge.obj SHL4RPATH := URELIB @@ -74,13 +62,7 @@ SHL5IMPLIB := i$(SHL5TARGET) SHL5STDLIBS := $(purpenv_helper_LIB) $(SALLIB) $(CPPULIB) SHL5OBJS := $(SLO)$/LogBridge.obj -.IF "$(GUI)"=="OS2" -SHL5VERSIONMAP=unsafe_os2.map -SHL5DEF=$(MISC)$/$(SHL5TARGET).def -DEF5NAME=LogMapping.def -.ELSE SHL5DEF := empty.def -.ENDIF SHL5RPATH := URELIB # --- Targets ------------------------------------------------------ diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 8d1003bd4de6..0235f9aed13d 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -50,7 +50,7 @@ SHL1LIBS= \ $(SLB)$/cppu_threadpool.lib \ $(SLB)$/cppu_cppu.lib -.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)" == "WNT" SHL1TARGET=$(TARGET)$(UDK_MAJOR) .ELSE SHL1TARGET= uno_$(TARGET) @@ -74,8 +74,6 @@ SHL2TARGET := $(NAMEpurpenv_helper) DEF2NAME := $(SHL2TARGET) .IF "$(GUI)$(COM)"=="WNTGCC" SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map -.ELIF "$(GUI)"=="OS2" -SHL2VERSIONMAP:=uno_purpenvhelperwntgcc.map .ELIF "$(COMNAME)"=="mscx" SHL2VERSIONMAP:=$(SHL2TARGET)X.map .ELSE diff --git a/cppu/util/makefile.pmk b/cppu/util/makefile.pmk index c1259ddf4a10..95e83db6dc07 100644 --- a/cppu/util/makefile.pmk +++ b/cppu/util/makefile.pmk @@ -26,7 +26,3 @@ #************************************************************************* ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE - -.IF "$(GUI)" == "OS2" -STL_OS2_BUILDING=1 -.ENDIF |