From b3294437e2d0f70224e16a7e8cd787407a8c53c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Tue, 9 Dec 2008 08:43:20 +0000
Subject: [PATCH] CWS-TOOLING: integrate CWS os2port04 2008-11-27 13:22:38
 +0100 ydario  r264480 : #i96439#: fix build for unix platforms. 2008-11-26
 18:32:42 +0100 ydario  r264433 : #i96439#: os2 systemshell code (dummy code).
 2008-11-26 16:33:48 +0100 ydario  r264421 : #i96439#: vcl fix for pdf export
 of truetype fonts. 2008-11-26 15:04:44 +0100 ydario  r264399 : #i96439#:
 build macros fix scripts, gcc specific flags. 2008-11-26 15:00:15 +0100
 ydario  r264398 : #i96439#: vcl source code updates. 2008-11-26 13:21:37
 +0100 ydario  r264378 : #i96439#: os2 build system fixes. 2008-11-26 13:20:27
 +0100 ydario  r264377 : #i96439#: configuration and build macros updates.
 2008-11-26 13:16:35 +0100 ydario  r264375 : #i96439#: new launcher code,
 build system updates. 2008-11-26 13:12:49 +0100 ydario  r264373 : #i96439#:
 use OSL endian macro. 2008-11-26 12:54:50 +0100 ydario  r264371 : #i96439#:
 os2 build system fixes. 2008-11-26 12:30:46 +0100 ydario  r264367 : #i96439#:
 os2 build system fixes. 2008-11-26 12:09:33 +0100 ydario  r264365 : #i96439#:
 _Export is a reserved keyword under gcc for os2. 2008-11-26 12:08:12 +0100
 ydario  r264364 : #i96439#: new libpath handling. 2008-11-26 11:57:51 +0100
 ydario  r264363 : #i96439#: use C call, generates proper stabs; fix rtti
 names.

---
 dbaccess/source/filter/xml/makefile.mk | 5 ++++-
 dbaccess/util/makefile.mk              | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk
index 6eb3f1f47094..fc7f107832b4 100644
--- a/dbaccess/source/filter/xml/makefile.mk
+++ b/dbaccess/source/filter/xml/makefile.mk
@@ -95,7 +95,10 @@ SHL1STDLIBS=\
     $(SO2LIB)			\
     $(SALLIB)
 
-.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"=="OS2"
+SHL1STDLIBS+= \
+        idba.lib
+.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
 SHL1STDLIBS+= \
         -ldba$(DLLPOSTFIX)
 .ELSE
diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk
index 1f7f14601c1d..af5ee5e9ba38 100644
--- a/dbaccess/util/makefile.mk
+++ b/dbaccess/util/makefile.mk
@@ -134,7 +134,10 @@ SHL2STDLIBS= \
         $(VOSLIB)				\
         $(SALLIB)
         
-.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"=="OS2"
+SHL2STDLIBS+=	$(LB)$/i$(TARGET).lib
+SHL2DEPN=$(LB)$/i$(TARGET).lib
+.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
 SHL2STDLIBS+= \
         -l$(TARGET)$(DLLPOSTFIX)
 SHL2DEPN=$(SHL1TARGETN)