Simplified BC++ makefiles; C++Builder 1.0 compilation seems to work;

changed #ifdef -> #if for wxUSE_STD_IOSTREAM; #ifdefed thread usage in app.cpp.


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

distrib/msw/cw.rsp

@@ -1,4 +1,10 @@
 src/make_cw.mcp
+include/wx_cw.pch
+include/wx_cw.pch++
+include/wx_cw_d.pch
+include/wx_cw_d.pch++
+
+samples/bombs/make_cw.mcp
 
 samples/checklst/make_cw.mcp
 
@@ -20,6 +26,8 @@ samples/dynamic/make_cw.mcp
 
 samples/forty/make_cw.mcp
 
+samples/fractal/make_cw.mcp
+
 samples/grid/make_cw.mcp
 
 samples/help/make_cw.mcp
@@ -54,6 +62,8 @@ samples/png/make_cw.mcp
 
 samples/printing/make_cw.mcp
 
+samples/proplist/make_cw.mcp
+
 samples/Regtest/make_cw.mcp
 
 samples/resource/make_cw.mcp

distrib/msw/gtk.rsp

@@ -1,7 +1,6 @@
 install-sh
 Makefile
 template.mak
-TODO.txt
 configure.in
 config.guess
 config.sub
@@ -12,6 +11,7 @@ docs/gtk/*.html
 docs/gtk/*.txt
 
 include/wx/gtk/*.h
+include/install-sh
 
 src/Makefile
 src/Makefile.in

distrib/msw/motif.rsp

@@ -92,6 +92,7 @@ src/make.env
 src/makeprog.env
 
 include/wx/motif/*.h
+include/install-sh
 
 docs/motif/*.txt
 docs/motif/makewx

docs/msw/install.txt

@@ -78,11 +78,22 @@ Borland C++ 4.5/5.0 compilation
    'XXX' not found in library.
 3. Change directory to a sample such as minimal, and type
   'make -f makefile.b32'.
+4. For release versions, recompile wxWindows and samples using
+   'make -f makefile.b32 clean'
+   'make -f makefile.b32 FINAL=1'
+   for the library and samples.
 
 Note: 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.
 
+Borland C++Builder compilation
+------------------------------
+
+C++Builder compilation is the same as for Borland C++ above.
+It has only been tested with C++Builder 1.0 so far, and no
+project files are currently supplied.
+
 Watcom C++ 10.6 compilation
 ---------------------------
 

include/wx/gtk/textctrl.h

@@ -21,7 +21,7 @@
 #include "wx/string.h"
 #include "wx/control.h"
 
-#ifdef wxUSE_STD_IOSTREAM
+#if wxUSE_STD_IOSTREAM
 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>

include/wx/gtk1/textctrl.h

@@ -21,7 +21,7 @@
 #include "wx/string.h"
 #include "wx/control.h"
 
-#ifdef wxUSE_STD_IOSTREAM
+#if wxUSE_STD_IOSTREAM
 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>

include/wx/log.h

@@ -180,7 +180,7 @@ private:
   FILE *m_fp;
 };
 
-#ifdef wxUSE_STD_IOSTREAM
+#if wxUSE_STD_IOSTREAM
 // log everything to an "ostream", cerr by default
 class WXDLLEXPORT wxLogStream : public wxLog
 {
@@ -199,7 +199,7 @@ protected:
 
 #ifndef wxUSE_NOGUI
 
-#ifdef wxUSE_STD_IOSTREAM
+#if wxUSE_STD_IOSTREAM
 // log everything to a text window (GUI only of course)
 class WXDLLEXPORT wxLogTextCtrl : public wxLogStream
 {

include/wx/motif/setup.h

@@ -131,6 +131,9 @@
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code
+#define wxUSE_STD_IOSTREAM  1
+                                  // Use standard C++ streams if 1. If 0, use wxWin
+                                  // streams implementation.
 /*
  * Finer detail
  *

include/wx/msw/setup.h

@@ -162,6 +162,10 @@
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code
+#define wxUSE_STD_IOSTREAM  1
+                                  // Use standard C++ streams if 1. If 0, use wxWin
+                                  // streams implementation.
+
 /*
  * Finer detail
  *

include/wx/stubs/setup.h

@@ -120,6 +120,9 @@
                                   // Use zlib for compression in streams and PNG code
 #define wxUSE_LIBPNG        1
                                   // Use PNG bitmap code
+#define wxUSE_STD_IOSTREAM  1
+                                  // Use standard C++ streams if 1. If 0, use wxWin
+                                  // streams implementation.
 /*
  * Finer detail
  *

samples/bombs/makefile.b32

@@ -1,68 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
 # Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds bombs example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=bombs
+OBJECTS = $(TARGET).obj bombs1.obj game.obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = bombs.obj bombs1.obj game.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-bombs.obj:      bombs.$(SRCSUFF)
-
-bombs1.obj:      bombs1.$(SRCSUFF)
-
-game.obj:      game.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/checklst/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds checklst example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=checklst
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = checklst.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-checklst.obj:      checklst.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/config/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
 # Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds conftest example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=conftest
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = conftest.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-conftest.obj:      conftest.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/controls/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds controls example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=controls
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = controls.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-controls.obj:      controls.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/db/makefile.b32

@@ -1,62 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
 # Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds db example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=dbtest
+OBJECTS = $(TARGET).obj listdb.obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = dbtest.obj listdb.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/dialogs/makefile.b32

@@ -1,63 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
-# Author:       Adnre Beltman
+# Author:	Julian Smart
-# Created:      1995
+# Created:	1999
 # Updated:	
-# Copyright:    (c) 1995, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds dialogs example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB=$(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=dialogs
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = dialogs.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-dialogs.obj:      dialogs.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/dnd/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds dnd example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=dnd
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = dnd.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-dnd.obj:      dnd.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/docview/makefile.b32

@@ -1,68 +1,16 @@
 #
 # File:		makefile.b32
-# Author:	Patrick Halke
+# Author:	Julian Smart
-# Created:	1995
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds 32bit buttonbar example.
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
 
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB=$(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
-
 TARGET=docview
+OBJECTS = $(TARGET).obj view.obj doc.obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = docview.obj doc.obj view.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-docview.obj:      docview.$(SRCSUFF) docview.h
-
-doc.obj:      doc.$(SRCSUFF) doc.h
-
-view.obj:      view.$(SRCSUFF) view.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/docvwmdi/makefile.b32

@@ -1,68 +1,16 @@
 #
 # File:		makefile.b32
-# Author:	Patrick Halke
+# Author:	Julian Smart
-# Created:	1995
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds 32bit buttonbar example.
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
 
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB=$(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
-
 TARGET=docview
+OBJECTS = $(TARGET).obj view.obj doc.obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = docview.obj doc.obj view.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-docview.obj:      docview.$(SRCSUFF) docview.h
-
-doc.obj:      doc.$(SRCSUFF) doc.h
-
-view.obj:      view.$(SRCSUFF) view.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/dynamic/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds dynamic example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=dynamic
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = dynamic.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-dynamic.obj:      dynamic.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/fractal/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
 # Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds fractal example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=fractal
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = fractal.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-fractal.obj:      fractal.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/grid/makefile.b32

@@ -1,63 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds grid test example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=test
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-test.obj:      test.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/internat/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds internat example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=internat
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = internat.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-internat.obj:      internat.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/joytest/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
-# Author:	Patrick Halke
+# Author:	Julian Smart
-# Created:	1995
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds 32bit MDI example.
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=joytest
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = joytest.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-joytest.obj:      joytest.$(SRCSUFF) joytest.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
-
 

samples/layout/makefile.b32

@@ -1,63 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds layout example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=layout
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = layout.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-layout.obj:      layout.$(SRCSUFF) layout.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/listctrl/makefile.b32

@@ -1,63 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds listtest example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=listtest
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = listtest.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-listtest.obj:      listtest.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/mdi/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
-# Author:	Patrick Halke
+# Author:	Julian Smart
-# Created:	1995
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds 32bit MDI example.
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=mdi
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = mdi.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-mdi.obj:      mdi.$(SRCSUFF) mdi.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
-
 

samples/memcheck/makefile.b32

@@ -1,65 +1,16 @@
 #
 # File:		makefile.b32
-# Author:	Patrick Halke
+# Author:	Julian Smart
-# Created:	1995
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds 32bit buttonbar example.
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\wx
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=memcheck
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = memcheck.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-memcheck.obj:      memcheck.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
-
 

samples/minifram/makefile.b32

@@ -1,63 +1,16 @@
 #
 # File:		makefile.b32
-# Author:	Patrick Halke
+# Author:	Julian Smart
-# Created:	1995
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds 32bit buttonbar example.
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
 
 TARGET=test
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-test.obj:      test.$(SRCSUFF) test.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/minimal/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
 # Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds minimal example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=minimal
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = minimal.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-minimal.obj:      minimal.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/minimal/minimal.def

@@ -1,7 +1,6 @@
 NAME         Minimal
 DESCRIPTION  'Minimal wxWindows application'
 EXETYPE      WINDOWS
-STUB         'WINSTUB.EXE'
 CODE         PRELOAD MOVEABLE DISCARDABLE
 DATA         PRELOAD MOVEABLE MULTIPLE
 HEAPSIZE     4048

samples/nativdlg/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds 32bit nativdlg example.
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=nativdlg
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = nativdlg.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-nativdlg.obj:	nativdlg.$(SRCSUFF) nativdlg.h # dialog1.wxr
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /D__WXMSW__ /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
-
 

samples/notebook/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds notebook example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=test
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-test.obj:      test.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/oleauto/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
 # Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds oleauto example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=oleauto
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = oleauto.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-oleauto.obj:      oleauto.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/ownerdrw/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds ownerdrw example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=ownerdrw
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = ownerdrw.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-ownerdrw.obj:      ownerdrw.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/printing/makefile.b32

@@ -1,63 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds printing example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=printing
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = printing.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-printing.obj:      printing.$(SRCSUFF) printing.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/proplist/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
 # Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds test example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=test
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-test.obj:      test.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/resource/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds 32bit resource example.
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=resource
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = resource.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-resource.obj:	resource.$(SRCSUFF) resource.h dialog1.wxr
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
-
 

samples/sashtest/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds sashtest example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=sashtest
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = sashtest.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-sashtest.obj:      sashtest.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/splitter/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds splitter example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=test
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-test.obj:      test.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/tab/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds tab example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=test
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-test.obj:      test.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/taskbar/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds tab example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=tbtest
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = tbtest.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-tbtest.obj:      tbtest.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/thread/makefile.b32

@@ -1,64 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds thread example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=test
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-test.obj:      test.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/toolbar/makefile.b32

@@ -1,63 +1,16 @@
 #
 # File:		makefile.b32
-# Author:	Patrick Halke
+# Author:	Julian Smart
-# Created:	1995
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds 32bit buttonbar example.
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=test
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = test.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-test.obj:      test.$(SRCSUFF) test.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/treectrl/makefile.b32

@@ -1,63 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds treetest example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=treetest
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = treetest.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-treetest.obj:      treetest.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/typetest/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
 # Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds typetest example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=typetest
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = typetest.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-typetest.obj:      typetest.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/validate/makefile.b32

@@ -1,66 +1,16 @@
 #
-# File:		makefile.bcc
+# File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds validate example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXBASESRC = $(WXDIR)\src\base
-WXBASEINC = $(WXDIR)\include\base
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=validate
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = validate.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-validate.obj:      validate.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

samples/wxpoem/makefile.b32

@@ -1,64 +1,16 @@
 #
 # File:		makefile.b32
 # Author:	Julian Smart
-# Created:	1993
+# Created:	1999
 # Updated:	
 # Copyright:
 #
-# "%W% %G%"
+# Makefile : Builds sample for 32-bit BC++
-#
-# Makefile : Builds wxpoem example
-
-# WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=wxpoem
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
+!include $(WXDIR)\src\makeprog.b32
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = wxpoem.obj
-
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-wxpoem.obj:      wxpoem.$(SRCSUFF)
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

src/common/log.cpp

@@ -389,7 +389,7 @@ void wxLogStderr::DoLogString(const char *szString)
 // wxLogStream implementation
 // ----------------------------------------------------------------------------
 
-#ifdef wxUSE_STD_IOSTREAM
+#if wxUSE_STD_IOSTREAM
 wxLogStream::wxLogStream(ostream *ostr)
 {
   if ( ostr == NULL )
@@ -410,7 +410,7 @@ void wxLogStream::DoLogString(const char *szString)
 // wxLogTextCtrl implementation
 // ----------------------------------------------------------------------------
 
-#ifdef wxUSE_STD_IOSTREAM
+#if wxUSE_STD_IOSTREAM
 wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
 // DLL mode in wxMSW, can't use it.
 #if defined(NO_TEXT_WINDOW_STREAM)

src/generic/dirdlgg.cpp

@@ -34,6 +34,11 @@
 
 #include "wx/generic/dirdlgg.h"
 
+// If compiled under Windows, this macro can cause problems
+#ifdef GetFirstChild
+#undef GetFirstChild
+#endif
+
 /* XPM */
 static char * icon1_xpm[] = {
 /* width height ncolors chars_per_pixel */

src/makeprog.b32

@@ -0,0 +1,54 @@
+#
+# File:		makeprog.b32
+# Author:	Julian Smart
+# Created:	1999
+# Updated:	
+# Copyright:
+#
+# Include file for samples and utilities. Set TARGET and OBJECTS
+# before including this file.
+
+# WXWIN and BCCDIR are set by parent make
+
+WXDIR = $(WXWIN)
+!include $(WXDIR)\src\makeb32.env
+
+LIBS=$(WXLIB) cw32mt import32 ole2w32
+
+!if "$(FINAL)" == "0"
+LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS= -v
+!else
+LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS =
+!endif
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+$(TARGET).exe:	$(OBJECTS) $(TARGET).res
+  tlink32 $(LINKFLAGS) @&&!
+c0w32.obj $(OBJECTS)
+$(TARGET)
+nul
+$(LIBS)
+
+$(TARGET).res
+!
+
+.$(SRCSUFF).obj:
+	bcc32 $(CPPFLAGS) -c {$< }
+
+.c.obj:
+	bcc32 $(CPPFLAGS) -P- -c {$< }
+
+$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws
+

src/msw/app.cpp

@@ -38,7 +38,10 @@
 #include "wx/msw/private.h"
 #include "wx/log.h"
 #include "wx/module.h"
+
+#if wxUSE_THREADS
 #include "wx/thread.h"
+#endif
 
 #if wxUSE_WX_RESOURCES
   #include "wx/resource.h"
@@ -868,11 +871,12 @@ void wxApp::OnIdle(wxIdleEvent& event)
         // idle events
         event.RequestMore(TRUE);
     }
-
+#if wxUSE_THREADS
     // give a chance to all other threads to perform GUI calls
     wxMutexGuiLeave();
     ::Sleep(0);
     wxMutexGuiEnter();
+#endif
 
     s_inOnIdle = FALSE;
 }

src/msw/makefile.b32

@@ -646,26 +646,16 @@ all_execs:
     make -f makefile.b32 all_execs
     cd $(WXDIR)\src\msw
 
-all_libs:
-    cd $(WXDIR)\src\msw
-    make -f makefile.b32 ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
-          wxstring wxtree mfutils # wxxpm
-
-all_contribs:
-    cd $(WXDIR)\src\msw
-    make -f makefile.b32 ctl3d fafa wxstring itsy gauge # wxxpm
-
-# CONTRIB
-ctl3d:  $(CFG)
-        cd $(WXDIR)\src\msw\ctl3d\borland
-        make -f makefile.b32 -DCFG=$(CFG)
-        cd $(WXDIR)\src\msw
-
 wxxpm:	$(CFG)
 	cd $(WXDIR)\src\xpm
 	make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
 	cd $(WXDIR)\src\msw
 
+clean_wxxpm:	$(CFG)
+	cd $(WXDIR)\src\xpm
+	make -f makefile.b32 clean
+	cd $(WXDIR)\src\msw
+
 png:    $(CFG)
         cd $(WXDIR)\src\png
         make -f makefile.b32 
@@ -697,8 +687,8 @@ $(CFG): makefile.b32
 -w-pia
 -w-aus
 -w-rch
--Oxt
 -WE
+-tWM
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
 -I$(WXDIR)\include\wx\msw\gnuwin32
@@ -714,6 +704,7 @@ $(WIN95FLAG)
 ! $(CFG)
 
 #-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
+# -Oxt
 
 clean: $(PERIPH_CLEAN_TARGET)
     erase $(LIBTARGET)

src/msw/makefile.g95

@@ -61,7 +61,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= \
   $(GENDIR)/choicdgg.$(OBJSUFF) \
   $(GENDIR)/colrdlgg.$(OBJSUFF) \
-  $(GENDIR)/dirdlg.$(OBJSUFF) \
+  $(GENDIR)/dirdlgg.$(OBJSUFF) \
   $(GENDIR)/fontdlgg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/laywin.$(OBJSUFF) \

utils/dialoged/src/makefile.b32

@@ -12,42 +12,9 @@
 # WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=dialoged
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
-
 OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtable.obj winstyle.obj
 
-$(TARGET).exe:	$(OBJECTS) $(TARGET).def $(TARGET).res
+!include $(WXDIR)\src\makeb32.env
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa $(TARGET)
-
-clean:
-        -erase *.obj *.exe *.res *.map *.rws
-
 

utils/tex2rtf/src/makefile.b32

@@ -12,51 +12,9 @@
 # WXWIN and BCCDIR are set by parent make
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=tex2rtf
-
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
 OBJECTS = tex2rtf.obj tex2any.obj texutils.obj rtfutils.obj xlputils.obj htmlutil.obj readshg.obj table.obj
 
-$(TARGET).exe:	$(OBJECTS) $(TARGET).res
+!include $(WXDIR)\src\makeprog.b32
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 

utils/wxtree/src/makefile.b32

@@ -10,62 +10,9 @@
 # Makefile : Builds 32bit wxtree library for 32-bit BC++
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
 
-WXINC = $(WXDIR)\include
 TARGET=test
-TESTOBJECTS=test.obj
+OBJECTS=$(TARGET)
-LIBTARGET= $(WXLIBDIR)\wxprop.lib
-LIBS=$(WXLIBDIR)\wx32.lib $(LIBTARGET) cw32 import32 ole2w32
 
-!ifndef DEBUG
+!include $(WXDIR)\src\makeprog.b32
-DEBUG=0
-!endif
 
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v -DDEBUG=$(DEBUG)
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -O2
-DEBUG_FLAGS = -DDEBUG=$(DEBUG)
-!endif
-
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-.$(SRCSUFF).obj:
-	bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-	bcc32 $(CPPFLAGS) -P- -c {$< }
-
-OBJECTS = wxtree.obj
-
-all:    $(LIBTARGET)
-
-$(LIBTARGET):	$(OBJECTS)
-	erase $(LIBTARGET)
-	tlib $(LIBTARGET) /P32 @&&!
-+$(OBJECTS:.obj =.obj +)
-!
-
-wxtree.obj:	wxtree.$(SRCSUFF) wxtree.h
-
-$(TARGET).exe:	$(TESTOBJECTS) $(LIBTARGET) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(TESTOBJECTS)
-$(TARGET)
-nul
-$(LIBS) $(LIBTARGET)
-$(TARGET).def
-$(TARGET).res
-!
-
-test.obj:	test.$(SRCSUFF) test.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj $(LIBTARGET) *.exe *.res *.map *.rws