From 52abdc8300b4822162a95b994ccb83a29600612a Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Fri, 22 Jul 2005 12:44:44 +0000
Subject: [PATCH] LIBDIRNAME unique between ports buildable with Open Watcom.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/bakefiles/common.bkl | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index c40caa90bb..a01a5265b4 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -183,8 +183,10 @@
     </if>
 
     <set var="LIBTYPE_SUFFIX" make_var="1">
-        <if cond="FORMAT!='autoconf' and SHARED=='0'">lib</if>
-        <if cond="FORMAT!='autoconf' and SHARED=='1'">dll</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='0' and PLATFORM_WIN32=='1'">lib</if>
+        <if cond="FORMAT!='autoconf' and SHARED=='1' and PLATFORM_WIN32=='1'">dll</if>
+        <if cond="FORMAT=='watcom' and SHARED=='0' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_lib</if>
+        <if cond="FORMAT=='watcom' and SHARED=='1' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_dll</if>
     </set>
 
     <set var="LIBDIRNAME" make_var="1">
@@ -426,8 +428,15 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
 
         <ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
 
+        <!-- system libraries on os2: -->
+        <if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'">
+            <if cond="FORMAT=='watcom'">
+                <sys-lib>upm32</sys-lib>
+            </if>
+        </if>
+
         <!-- system libraries on windows: -->
-        <if cond="FORMAT!='autoconf'">
+        <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
             <sys-lib>$(UNICOWS_LIB)</sys-lib>
             <if cond="FORMAT=='borland'">
                 <sys-lib>ole2w32</sys-lib>
-- 
2.45.2