From 572eed55ba52c832137c68bed05aa248738a1ed1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 25 Oct 1999 07:41:07 +0000
Subject: [PATCH] BC++ 16bit makefile fixes (obj isn't replaced with suffix in
 filenames)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/bcc.t | 17 ++++++-----------
 src/msw/makefile.bcc    |  6 +++---
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/distrib/msw/tmake/bcc.t b/distrib/msw/tmake/bcc.t
index 3fe2a8915c..87cd636126 100644
--- a/distrib/msw/tmake/bcc.t
+++ b/distrib/msw/tmake/bcc.t
@@ -102,7 +102,7 @@ PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=
 
 !if "$(USE_CTL3D)" == "1"
-PERIPH_LIBS=$(BCCDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS)
 !endif
 
 !if "$(USE_XPM_IN_MSW)" == "1"
@@ -174,7 +174,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     foreach (@objs) {
         $text .= $_ . ": ";
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
-        s/obj/$suffix/;
+        s/obj$/$suffix/;
         $text .= $_ . "\n\n";
     }
 #$}
@@ -189,7 +189,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
         $text .= $_ . ": ";
         $suffix = $project{"WXCOBJS"} =~ /\Q$_/ ? "c" : '$(SRCSUFF)';
         s/MSWDIR/COMMDIR/;
-        s/obj/$suffix/;
+        s/obj$/$suffix/;
         $text .= $_ . "\n\n";
     }
 #$}
@@ -204,7 +204,7 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     foreach (@objs) {
         $text .= $_ . ": ";
         s/MSWDIR/GENDIR/;
-        s/obj/\$(SRCSUFF)/;
+        s/obj$/\$(SRCSUFF)/;
         $text .= $_ . "\n\n";
     }
 #$}
@@ -226,19 +226,14 @@ all_execs:
 
 all_libs:
     cd $(WXDIR)\src\msw
-    make -f makefile.bcc ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
+    make -f makefile.bcc dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
           wxstring wxtree mfutils # wxxpm
 
 all_contribs:
     cd $(WXDIR)\src\msw
-    make -f makefile.bcc ctl3d fafa wxstring itsy gauge # wxxpm
+    make -f makefile.bcc fafa wxstring itsy gauge # wxxpm
 
 # CONTRIB
-ctl3d:  $(CFG)
-        cd $(WXDIR)\src\msw\ctl3d\borland
-        make -f makefile.bcc -DCFG=$(CFG)
-        cd $(WXDIR)\src\msw
-
 wxxpm:	$(CFG)
 	cd $(WXDIR)\src\xpm
 	make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 815b4ba22d..e36dc50848 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 14:33, 1999/10/23
+# This file was automatically generated by tmake at 09:40, 1999/10/25
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -269,8 +269,6 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
 +$(PERIPH_LIBS:.lib =.lib +)
 !
 
-#+$(OBJECTS:.obj =.obj +)
-
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 
@@ -597,6 +595,8 @@ $(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 
 ${MSWDIR}\resourc2.obj: ${COMMDIR}\resourc2.$(SRCSUFF)
 
+
+
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)