From 73c6e8505e1bad59b42621fe13d0dad8e661ad9c Mon Sep 17 00:00:00 2001
From: Guillermo Rodriguez Garcia <guille@iies.es>
Date: Tue, 4 Jul 2000 06:03:13 +0000
Subject: [PATCH] Changes to the BC makefiles as proposed by Christoph Schulz.
 The problem was: === Cut === Unfortunately, now you cannot build a wxWin
 program using both static wxWin library and static RTL (because _RTLDLL is
 now always defined). === Cut ===

This is fixed now:
=== Cut ===
Now, if you build/use wxWin as a DLL (WXMAKINGDLL=1/WXUSINGDLL=1)
the dynamic RTL (c?mt32??.dll) is used, otherwise the static
library.
=== Cut ===


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/b32.t | 1 -
 src/makeprog.b32        | 6 +++++-
 src/msw/makefile.b32    | 5 ++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index f9951b3bda..a701f3c2be 100644
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -360,7 +360,6 @@ $(CFG): makefile.b32
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
--D_RTLDLL
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__
diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 517261fca6..57d43f8396 100644
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -13,7 +13,11 @@
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
+!if "$(WXUSINGDLL)" == "1"
 LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
+!else
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
+!endif
 
 # Note: you may need to remove some libraries for earlier versions of BC++, as below
 #LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib xpm tiff
@@ -30,7 +34,7 @@ OPT = -Od
 DEBUG_FLAGS =
 !endif
 
-CPPFLAGS=$(CPP_FLAGS) $(EXTRACPPFLAGS) $(DEBUG_FLAGS) $(DLL_FLAGS) $(OPT) @$(CFG)
+CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT)
 
 all: $(TARGET).exe $(EXTRATARGETS)
 
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 3cada7ad56..d1a83d7ee0 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -28,8 +28,8 @@ THISDIR = $(WXDIR)\src\msw
 
 # Set all these to 1 if you want to build a dynamic library
 !if "$(DLL)" == "1"
-WXMAKINGDLL=1
-WXBUILDDLL=1
+WXMAKINGDLL=0
+WXBUILDDLL=0
 !endif
 
 !include $(WXDIR)\src\makeb32.env
@@ -992,7 +992,6 @@ $(CFG): makefile.b32
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
--D_RTLDLL
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__