summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-09-10 22:44:47 +0000
committerKurt Zenker <kz@openoffice.org>2009-09-10 22:44:47 +0000
commite221a8925fbdd5c681a2e186213529344222c88a (patch)
tree38c20b772d85811508a1cb010bc24fede23029cd
parent7dcc5d04f9772494ae52a15cf192def5bddb9eb4 (diff)
CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
-rw-r--r--reportdesign/util/makefile.mk22
1 files changed, 18 insertions, 4 deletions
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
index c6a5c8e8f75f..e062caed9abc 100644
--- a/reportdesign/util/makefile.mk
+++ b/reportdesign/util/makefile.mk
@@ -71,7 +71,10 @@ SHL1STDLIBS= \
$(VOSLIB) \
$(SALLIB)
-.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"=="OS2"
+SHL1STDLIBS+= \
+ idbu.lib
+.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
SHL1STDLIBS+= \
-ldbu$(DLLPOSTFIX)
.ELSE
@@ -127,7 +130,11 @@ SHL2STDLIBS= \
$(SO2LIB) \
$(I18NISOLANGLIB) \
$(SALLIB)
-.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"=="OS2"
+SHL2STDLIBS+= \
+ idbu.lib \
+ i$(TARGET).lib
+.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
SHL2STDLIBS+= \
-ldbu$(DLLPOSTFIX) \
-l$(TARGET)$(DLLPOSTFIX)
@@ -137,7 +144,11 @@ SHL2STDLIBS+= \
i$(TARGET).lib
.ENDIF
-.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"=="OS2"
+SHL2STDLIBS+= \
+ ifor.lib \
+ iforui.lib
+.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
SHL2STDLIBS+= \
-lfor$(DLLPOSTFIX) \
-lforui$(DLLPOSTFIX)
@@ -192,7 +203,10 @@ SHL3STDLIBS=\
$(SOTLIB) \
$(SO2LIB) \
$(SALLIB)
-.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"=="OS2"
+SHL3STDLIBS+= \
+ irpt.lib
+.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
SHL3STDLIBS+= \
-l$(TARGET)$(DLLPOSTFIX)
.ELSE