you don't have to set BCCDIR for compilation with Borland any longer (patch 550105)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/BuildCVS.txt b/BuildCVS.txt
index 7c14fd12cec91ddb4bfc4f3fc6a73cc7904a5958..25e5e53cf7a400ee4f3797d685c32cf331b985c5 100644 (file)
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -78,9 +78,6 @@ d) Borland (including free command line tools)
    See docs/msw/install.txt for details; in brief
 
 -> type set WXWIN=c:\wxwindows
--> type set BCCDIR=c:\progra~1\borland\cb4
--> type cd %WXWIN%\include\wx
--> type copy msw\setup0.h setup.h
 -> type cd %WXWIN%\src\msw
 -> type make -f makefile.b32
 

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index dc6eaa9ba9ed3bb772271b6eec6666d078e7a4d3..5f43f88be74959f47fc8eed71f6d4338a979e69d 100644 (file)
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -78,9 +78,7 @@
 # Makefile : Builds wxWindows library wx.lib for MS Windows,
 # and Borland C++ (32-bit).
 
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+# BCCDIR now defined in ../makeb32.env
 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 9663cd19b5bc4dc73d42a559ab0f721464d4d486..bbac97b1814c639b27e8ecd35bafcf81957bc924 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -219,11 +219,6 @@ Compiling using the makefiles:
    set WXWIN=c:\wxwindows
    to your autoexec.bat file], and that it uses the FAT (short
    name) form with no spaces.
-   Make sure your BCCDIR variable is set [e.g add
-   set BCCDIR=c:\progra~1\borland\bcc
-   to your autoexec.bat file], and that it points to the root directory of 
-   your Borland C++ installation, and it uses the FAT (short
-   name) form with no spaces.
    Reboot if needed for the changes to autoexec.bat to take effect.   
 2. Change directory to src\msw. Type 'make -f makefile.b32' to
    make the wxWindows core library. Ignore the warnings about
@@ -242,31 +237,38 @@ Compiling using the makefiles:
    Please note that the samples have not been exhaustively tested
    with this configuration.
 
-Note (1): the wxWindows library and (some) samples compile in 16-bit mode
+Note (1): In Borland 4.5 and earleir, using bcc.exe you also need to define BCCDIR
+in the autoexec.bat file; like this:
+   set BCCDIR=c:\progra~1\borland\bcc
+   so that it points to the root directory of 
+   your Borland C++ installation, and it uses the FAT (short
+   name) form with no spaces.
+
+
+Note (2): the wxWindows library and (some) samples compile in 16-bit mode
 using makefile.bcc, but at present the wxWindows resource system is switched
 off in this mode. See issues.txt for details.
 
-Note (2): unfortunately most samples won't link in 16-bit mode,
+Note (3): unfortunately most samples won't link in 16-bit mode,
 because the automatic data segment exceeds 64K. The minimal
 sample links and runs, however.
 
-Note (3): the wxWindows makefiles assume byte structure alignment. Please
+Note (4): the wxWindows makefiles assume byte structure alignment. Please
 make sure that your own project or makefile settings use the
 same alignment, or you could experience mysterious crashes. To
 change the alignment, add a suitable option to the $(CFG) target code
 in src/msw/makefile.b32.
 
-Note (4): if you get undefined _SQL... symbols at link time,
+Note (5): if you get undefined _SQL... symbols at link time,
 either install odbc32.lib from the BC++ CD-ROM into your BC++ lib
 directory, or set wxUSE_ODBC to 0 in include\wx\msw\setup.h and
 recompile wxWindows. The same applies if compiling using the IDE.
 
-Note (5): BC++ 4.5 (not 5.0) trips up over jdmerge.c in the JPEG folder;
+Note (6): BC++ 4.5 (not 5.0) trips up over jdmerge.c in the JPEG folder;
 you will therefore need to set wxUSE_LIBJPEG to 0 in setup.h and remove
 the jpeg target from src\msw\makefile.b32, and remove jpeg from
 src\makeprog.b32.
 
-Note (6): [obsolete]
 
 Note (7): If you wish debug messages to be sent to the console in
 debug mode, edit src\makeb32.env and change /aa to /Tpe in

diff --git a/src/makeb32.env b/src/makeb32.env
index 7fb792b653b773888258780270c647e580bf9f53..89cfffc358ecbe57b2bb6b26df2ce5fb48cf9ea4 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -7,6 +7,12 @@ RM= erase
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 
+BCCDIR=$(MAKEDIR)\..
+
+!if "$(BCCDIR)" == "\.."
+!error Your Borland compiler does not define MAKEDIR. Pleasedefine the BCCDIR variable in makeb32.env line 10, e.g. BCCDIR=d:\bc4
+!endif
+
 ARCHINCDIR=$(WXDIR)\lib\msw
 ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h
 

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index d53a56e9e2bc0074fe879e446ed9bf4a3d3bea84..880ac4a44bd6bbb57849e7f0eec41ab4b3e965ed 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -8,7 +8,8 @@
 # Include file for samples and utilities. Set TARGET and OBJECTS
 # before including this file.
 
-# WXWIN and BCCDIR are set by parent make
+# WXWIN  set by parent make
+# BCCDIR set in makeb32.env
 
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index d990bc3129d3099bd533c876ebf95ee0429bd37e..65504b448acab7c499c5f69b5cc4cdc773e994e5 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -15,9 +15,7 @@
 # Makefile : Builds wxWindows library wx.lib for MS Windows,
 # and Borland C++ (32-bit).
 
-!if "$(BCCDIR)" == ""
-!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
-!endif
+#BCCDIR now defined in ../makeb32.env
 
 !if "$(WXWIN)" == ""
 !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx