From 7e5510c0adaf142243b568cd7ee2d3577f33142a Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 21 Jun 2000 07:07:36 +0000
Subject: [PATCH] Further BC++ patches

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/b32.t |  4 +++-
 docs/msw/install.txt    | 10 +++++++++-
 include/wx/msw/setup0.h |  6 ++++++
 src/makeb32.env         |  4 ++--
 src/makeprog.b32        |  2 +-
 src/msw/makefile.b32    |  4 +++-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index bf810da7bc..f9951b3bda 100644
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -126,7 +126,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA
 DUMMY=dummy
 !else
 DUMMY=dummydll
-LIBS= cw32mt import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
+LIBS= cw32mti import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -343,6 +343,7 @@ clean_tiff:
 
 $(CFG): makefile.b32
 	copy &&!
+-Hc
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
 -d
@@ -359,6 +360,7 @@ $(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/docs/msw/install.txt b/docs/msw/install.txt
index 45dd67e6e6..5b39ce87a3 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -69,7 +69,8 @@ Visual C++ 4.0/5.0/6.0 compilation
 
 Using project files (VC++ 5 and 6 only):
 
-1. Unarchive wx2_x_y_vc.zip, the VC++ 5/6 project makefiles.
+1. Unarchive wxWindows-x.y.z-vc.zip, the VC++ 5/6 project
+   makefiles (already included in wxMSW-x.y.z.zip and the setup version).
 2. Open src/wxvc.dsp, set Debug or Release configuration for
    the wxvc project, and compile. Alternatively, use Batch Build
    to build both Debug and Release configurations.
@@ -228,6 +229,13 @@ Compiling using the makefiles:
    'make -f makefile.b32 clean'
    'make -f makefile.b32 FINAL=1'
    for the library and samples.
+5. To make and use wxWindows as a DLL, type
+   'make -f makefile.b32 clean'
+   'make -f makefile.b32 DLL=1'
+   and then for each sample,
+   'make -f makefile.b32 WXUSINGDLL=1'
+   Unfortunately there are still undiagnosed run-time problems
+   with this configuration.
 
 Note (1): the wxWindows library and (some) samples compile in 16-bit mode
 using makefile.bcc, but at present the wxWindows resource system is switched
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index ccbe7320e5..ec4e8e0ed6 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -733,6 +733,12 @@
 #define wxUSE_MS_HTML_HELP 0
 #endif
 
+// wxUSE_DBEUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode
+#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
+#undef wxUSE_DBEUG_NEW_ALWAYS
+#define wxUSE_DBEUG_NEW_ALWAYS 0
+#endif
+
 #if defined(__WXMSW__) && defined(__WATCOMC__)
 #undef wxUSE_LIBJPEG
 #define wxUSE_LIBJPEG 0
diff --git a/src/makeb32.env b/src/makeb32.env
index fec3d1afce..7baadb133f 100644
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -42,7 +42,7 @@ DLL=0
 #
 
 !if "$(WXMAKINGDLL)" == "1"
-DLL_FLAGS= -DWXMAKINGDLL=1 -D_WINDLL
+DLL_FLAGS= -DWXMAKINGDLL=1 # -D_WINDLL
 WXLIB= $(WXLIBDIR)\wx200.lib
 
 !else
@@ -60,7 +60,7 @@ WXLIB= $(WXLIBDIR)\wx32.lib
 !endif
 
 !if "$(WXBUILDDLL)" == "1"
-DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
+DLL_FLAGS= $(DLL_FLAGS) # -D_RTLDLL
 LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS)
 !endif
 
diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 113b4fee61..517261fca6 100644
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -13,7 +13,7 @@
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
 
 # 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
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 49f57b40c9..3cada7ad56 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -65,7 +65,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA
 DUMMY=dummy
 !else
 DUMMY=dummydll
-LIBS= cw32mt import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
+LIBS= cw32mti import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
 !endif
 
 LIBTARGET=$(WXLIB)
@@ -975,6 +975,7 @@ clean_tiff:
 
 $(CFG): makefile.b32
 	copy &&!
+-Hc
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
 -d
@@ -991,6 +992,7 @@ $(CFG): makefile.b32
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
 -L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
+-D_RTLDLL
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__