summaryrefslogtreecommitdiff
path: root/sal/rtl
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-09-20 14:24:49 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-09-20 14:24:49 +0000
commit844353d0c41fc1eba621127157fca31ca4c2d45a (patch)
tree3bfc7780156e88a60c58c91b4d51db75201bdb9b /sal/rtl
parent7268627fb5b5e7a8e8ce7c1b3686930d3c19222d (diff)
INTEGRATION: CWS os2port01 (1.25.36); FILE MERGED
2007/08/09 09:20:08 obr 1.25.36.2: RESYNC: (1.25-1.30); FILE MERGED 2006/11/29 14:26:53 ydario 1.25.36.1: Initial OS/2 import.
Diffstat (limited to 'sal/rtl')
-rw-r--r--sal/rtl/source/makefile.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index 9952223e938b..e8389184c29a 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.30 $
+# $Revision: 1.31 $
#
-# last change: $Author: rt $ $Date: 2007-04-04 07:59:31 $
+# last change: $Author: vg $ $Date: 2007-09-20 15:24:49 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -44,6 +44,10 @@ PROJECTPCH4DLL=TRUE
PROJECTPCH=cont_pch
PROJECTPCHSOURCE=cont_pch
+.IF "$(GUI)" == "OS2"
+STL_OS2_BUILDING=1
+.ENDIF
+
TARGETTYPE=CUI
# --- Settings -----------------------------------------------------
@@ -135,7 +139,7 @@ APP1LIBSALCPPRT=
# --- Extra objs ----------------------------------------------------
-.IF "$(OS)"=="LINUX"
+.IF "$(OS)"=="LINUX" || "$(OS)"=="OS2"
#
# This part builds a second version of alloc.c, with