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

diff --git a/distrib/msw/cw.rsp b/distrib/msw/cw.rsp
index db34f13bbe98767d1479fa5eb27c1538cfdbe781..b24d9ed863e964d7543caeca385538968ab6e70c 100644 (file)
--- a/distrib/msw/cw.rsp
+++ b/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

diff --git a/distrib/msw/gtk.rsp b/distrib/msw/gtk.rsp
index 9fee801c2248eb8170cd616be16ac06b2ebce613..995c328ac3cd9156db4d2b0010961874fc04a538 100644 (file)
--- a/distrib/msw/gtk.rsp
+++ b/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

diff --git a/distrib/msw/motif.rsp b/distrib/msw/motif.rsp
index 356a7bfab7228ca17236328d1e6762f935855164..b1ac4342151a6440c553468f0fea7db561d573ad 100644 (file)
--- a/distrib/msw/motif.rsp
+++ b/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

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 8a514b029b10a4997e79c35d6ad8c6ba583dbdf7..f840b14f72e037be2c56e27f4b56a6ff9f96cf92 100644 (file)
--- a/docs/msw/install.txt
+++ b/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
 ---------------------------
 

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index cc3ad2a303a7c58f7cdbe306b9e2ce8f8ef33410..da978601d18a3828bd7de81f77df28fc40788fed 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/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>

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index cc3ad2a303a7c58f7cdbe306b9e2ce8f8ef33410..da978601d18a3828bd7de81f77df28fc40788fed 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/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>

diff --git a/include/wx/log.h b/include/wx/log.h
index 074adb078f6f0e405f6ecf5a86881553482d7a80..ec849d8df93ab4708310a2825614f13028795649 100644 (file)
--- a/include/wx/log.h
+++ b/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
 {

diff --git a/include/wx/motif/setup.h b/include/wx/motif/setup.h
index b1456c86f4bcf1132b4efe69367c4880c853d86c..d2242990931e253d4a60481c5d384e2a458ef385 100644 (file)
--- a/include/wx/motif/setup.h
+++ b/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
  *

diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index 5ed16a4233a922ea825733e5d1ede6762ac330c2..2648217d19e9a31cf0199cf20d5df7b895673f66 100644 (file)
--- a/include/wx/msw/setup.h
+++ b/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
  *

diff --git a/include/wx/stubs/setup.h b/include/wx/stubs/setup.h
index 9ddf4ee20adc8073e726a9f500ab37e2091c4cc1..9b2a42e62ffad61cbbdffe687ab394cea40e2919 100644 (file)
--- a/include/wx/stubs/setup.h
+++ b/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
  *

diff --git a/samples/bombs/makefile.b32 b/samples/bombs/makefile.b32
index 0ad7fe88a14becc66da40c8c68d7791d1bbcd4c3..563f61f3b977ace40aaa56c0e547d82124fa4c15 100644 (file)
--- a/samples/bombs/makefile.b32
+++ b/samples/bombs/makefile.b32
@@ -1,68 +1,16 @@
 #
 # File:                makefile.b32
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1999
 # Updated:     
 # Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds bombs example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/checklst/makefile.b32 b/samples/checklst/makefile.b32
index e591971c85ae348fae6ded9ee156144d029ba2ad..a6a52a7bbcd93129e39362a89daaee8ccf37ffea 100644 (file)
--- a/samples/checklst/makefile.b32
+++ b/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 checklst example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/config/makefile.b32 b/samples/config/makefile.b32
index 9efb63a4c6a413cae2ebb7cf94753e654d671d16..b9da57631c5617970421527efe08b48589a6e7cf 100644 (file)
--- a/samples/config/makefile.b32
+++ b/samples/config/makefile.b32
@@ -1,64 +1,16 @@
 #
 # File:                makefile.b32
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1999
 # Updated:     
 # Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds conftest example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/controls/makefile.b32 b/samples/controls/makefile.b32
index c216b916ce39c8875c66f113a402b9d8579879d7..8accc1bcfd2184b275891221d89d9f5b371637bd 100644 (file)
--- a/samples/controls/makefile.b32
+++ b/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 controls example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/db/makefile.b32 b/samples/db/makefile.b32
index a634f6ad8bc2a625957c098108cb7e0a0884554e..a9f52b40a740368bf96fee9cd2520a3c7aa9a152 100644 (file)
--- a/samples/db/makefile.b32
+++ b/samples/db/makefile.b32
@@ -1,62 +1,16 @@
 #
 # File:                makefile.b32
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1999
 # Updated:     
 # Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds db example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/dialogs/makefile.b32 b/samples/dialogs/makefile.b32
index 0663799ab8c0c010da99d50708a29c5f1c557b27..3102e6b203ebffed9b8d63bf2a1d26764e217a5b 100644 (file)
--- a/samples/dialogs/makefile.b32
+++ b/samples/dialogs/makefile.b32
@@ -1,63 +1,16 @@
 #
-# File:                makefile.bcc
-# Author:       Adnre Beltman
-# Created:      1995
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
 # Updated:     
-# Copyright:    (c) 1995, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds dialogs example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/dnd/makefile.b32 b/samples/dnd/makefile.b32
index 3c621c9453db806d3df4e079400e13c7446915d8..ede724b269f33a9100f991f7cbce66e50dea7698 100644 (file)
--- a/samples/dnd/makefile.b32
+++ b/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 dnd example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/docview/makefile.b32 b/samples/docview/makefile.b32
index e9654bdcb4cb0f7ee4dcf10755a83726696226b9..8f52125c0ed6f53fd1fbd7685d7d38b322c4b8e0 100644 (file)
--- a/samples/docview/makefile.b32
+++ b/samples/docview/makefile.b32
@@ -1,68 +1,16 @@
 #
 # File:                makefile.b32
-# Author:      Patrick Halke
-# Created:     1995
+# Author:      Julian Smart
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds 32bit buttonbar example.
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/docvwmdi/makefile.b32 b/samples/docvwmdi/makefile.b32
index e9654bdcb4cb0f7ee4dcf10755a83726696226b9..8f52125c0ed6f53fd1fbd7685d7d38b322c4b8e0 100644 (file)
--- a/samples/docvwmdi/makefile.b32
+++ b/samples/docvwmdi/makefile.b32
@@ -1,68 +1,16 @@
 #
 # File:                makefile.b32
-# Author:      Patrick Halke
-# Created:     1995
+# Author:      Julian Smart
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds 32bit buttonbar example.
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/dynamic/makefile.b32 b/samples/dynamic/makefile.b32
index 6d46438ffc08f5635bc5d9704ffa65180e79e5df..d48780825cd73ace9ce1f737fa7b5105a8e629c7 100644 (file)
--- a/samples/dynamic/makefile.b32
+++ b/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 dynamic example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/fractal/makefile.b32 b/samples/fractal/makefile.b32
index 2dde4c58f876b99297612ccfaa948062d572a3b3..6000f3994d1d0f4cba72ea40060459adba6a95ca 100644 (file)
--- a/samples/fractal/makefile.b32
+++ b/samples/fractal/makefile.b32
@@ -1,64 +1,16 @@
 #
 # File:                makefile.b32
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1999
 # Updated:     
 # Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds fractal example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/grid/makefile.b32 b/samples/grid/makefile.b32
index 56b22620bbff01c177a29f7e6603565ccc7a92ea..95ddc80d76f728d37352e263489f8c331912bab8 100644 (file)
--- a/samples/grid/makefile.b32
+++ b/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 grid test example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/internat/makefile.b32 b/samples/internat/makefile.b32
index ae72e11b4b420c804e42f7d4d9d30d9e570dd0c3..b94db135dc515ce5fd19adf93591f45de10784f1 100644 (file)
--- a/samples/internat/makefile.b32
+++ b/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 internat example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/joytest/makefile.b32 b/samples/joytest/makefile.b32
index 59869b672a8e8a9502d1f1285d3b424038217b74..1ab531405a7fd690c768f674e89b1d3d9077d902 100644 (file)
--- a/samples/joytest/makefile.b32
+++ b/samples/joytest/makefile.b32
@@ -1,64 +1,16 @@
 #
 # File:                makefile.b32
-# Author:      Patrick Halke
-# Created:     1995
+# Author:      Julian Smart
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds 32bit MDI example.
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
-
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/layout/makefile.b32 b/samples/layout/makefile.b32
index bbb841c22de1d328b398456c9e20a83f6ac021ba..efb6636e03fdcdf449d755f39e8a5ecd5e86deab 100644 (file)
--- a/samples/layout/makefile.b32
+++ b/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 layout example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/listctrl/makefile.b32 b/samples/listctrl/makefile.b32
index 21dcf3486f330d9d05cd293fa5a7dda036b6d3fd..f2460bdb6c6d3244feb985d69866f9dc43c1bc13 100644 (file)
--- a/samples/listctrl/makefile.b32
+++ b/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 listtest example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/mdi/makefile.b32 b/samples/mdi/makefile.b32
index fc59709fe3feabd06d2a8fa0f234f9fa5d8b3007..145ea6105476fc410dca572b3a40c7d49a39f80e 100644 (file)
--- a/samples/mdi/makefile.b32
+++ b/samples/mdi/makefile.b32
@@ -1,64 +1,16 @@
 #
 # File:                makefile.b32
-# Author:      Patrick Halke
-# Created:     1995
+# Author:      Julian Smart
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds 32bit MDI example.
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
-
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/memcheck/makefile.b32 b/samples/memcheck/makefile.b32
index ba9930981add7cea9a3710a9741b091ef07d6787..a135eb3ab72677a44dff1a2bc17579b85486eeec 100644 (file)
--- a/samples/memcheck/makefile.b32
+++ b/samples/memcheck/makefile.b32
@@ -1,65 +1,16 @@
 #
 # File:                makefile.b32
-# Author:      Patrick Halke
-# Created:     1995
+# Author:      Julian Smart
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds 32bit buttonbar example.
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
-
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/minifram/makefile.b32 b/samples/minifram/makefile.b32
index 9f32c974ba6f07c3022dcf122ec8d34ff333dbbc..95ddc80d76f728d37352e263489f8c331912bab8 100644 (file)
--- a/samples/minifram/makefile.b32
+++ b/samples/minifram/makefile.b32
@@ -1,63 +1,16 @@
 #
 # File:                makefile.b32
-# Author:      Patrick Halke
-# Created:     1995
+# Author:      Julian Smart
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds 32bit buttonbar example.
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/minimal/makefile.b32 b/samples/minimal/makefile.b32
index 3d7a859ea5c0f2b7bc3200727a614a312e941acf..d1cbad638b12c7f9f91dee10fccd1032a75f652f 100644 (file)
--- a/samples/minimal/makefile.b32
+++ b/samples/minimal/makefile.b32
@@ -1,64 +1,16 @@
 #
 # File:                makefile.b32
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1999
 # Updated:     
 # Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds minimal example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/minimal/minimal.def b/samples/minimal/minimal.def
index 060bfe3fce2bee704518c66b7db4c234bf95bb55..59f0db711d5262b19bf2705d075ad3c3f7aaa227 100644 (file)
--- a/samples/minimal/minimal.def
+++ b/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

diff --git a/samples/nativdlg/makefile.b32 b/samples/nativdlg/makefile.b32
index 24926e06eae5c84955149f2fa11f30df496462f4..d84ffd3a49d0e01b9e17194fcab90fd8f1664677 100644 (file)
--- a/samples/nativdlg/makefile.b32
+++ b/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 32bit nativdlg example.
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
-
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/notebook/makefile.b32 b/samples/notebook/makefile.b32
index 54ae659bc5d37cb3943008e251ab9f587abc8a0b..95ddc80d76f728d37352e263489f8c331912bab8 100644 (file)
--- a/samples/notebook/makefile.b32
+++ b/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 notebook example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/oleauto/makefile.b32 b/samples/oleauto/makefile.b32
index b34dea7855a9353b55a12780ab1d94deb95ffc93..46f1832e2f2608c4b580aa1ab1188f315d34eb30 100644 (file)
--- a/samples/oleauto/makefile.b32
+++ b/samples/oleauto/makefile.b32
@@ -1,64 +1,16 @@
 #
 # File:                makefile.b32
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1999
 # Updated:     
 # Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds oleauto example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/ownerdrw/makefile.b32 b/samples/ownerdrw/makefile.b32
index b763889b14c26ad272268189895138f35051e23b..2b6dc5de6ae9d137c97887d4da4460eec3805abd 100644 (file)
--- a/samples/ownerdrw/makefile.b32
+++ b/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 ownerdrw example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/printing/makefile.b32 b/samples/printing/makefile.b32
index de2e4ce0f26366697394f63651fa5078b1edcef3..6e1400dbdf665161883178f96c5ef48dc694d0fa 100644 (file)
--- a/samples/printing/makefile.b32
+++ b/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 printing example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/proplist/makefile.b32 b/samples/proplist/makefile.b32
index 0af0c5f13f24afb263d6014bc3792903ad9efa72..95ddc80d76f728d37352e263489f8c331912bab8 100644 (file)
--- a/samples/proplist/makefile.b32
+++ b/samples/proplist/makefile.b32
@@ -1,64 +1,16 @@
 #
 # File:                makefile.b32
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1999
 # Updated:     
 # Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds test example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/resource/makefile.b32 b/samples/resource/makefile.b32
index 62381479eb4f77015f449074e307f2d6d0188bdc..dc944a82725b098dc240d22e1fd544d13f14d1e5 100644 (file)
--- a/samples/resource/makefile.b32
+++ b/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 32bit resource example.
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
-
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/sashtest/makefile.b32 b/samples/sashtest/makefile.b32
index 53b5657332e7bfb74380ef562fdccd8a544d4bb9..ce219415a6d80d5ae0cd59a89083234ce2cd456f 100644 (file)
--- a/samples/sashtest/makefile.b32
+++ b/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 sashtest example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/splitter/makefile.b32 b/samples/splitter/makefile.b32
index 9835e6dbfb0f1742678c662d76876de5abf8edc8..95ddc80d76f728d37352e263489f8c331912bab8 100644 (file)
--- a/samples/splitter/makefile.b32
+++ b/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 splitter example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/tab/makefile.b32 b/samples/tab/makefile.b32
index 305f4cbfc2e15304b6aee62256cdd66fb1e8506b..95ddc80d76f728d37352e263489f8c331912bab8 100644 (file)
--- a/samples/tab/makefile.b32
+++ b/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 tab example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/taskbar/makefile.b32 b/samples/taskbar/makefile.b32
index bdaebda7bd40537506e26910eb37c527451e8f26..65462aab6378e200f66485f1510b21c3a9451036 100644 (file)
--- a/samples/taskbar/makefile.b32
+++ b/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 tab example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/thread/makefile.b32 b/samples/thread/makefile.b32
index 92abaf142863a3b6635ca80a028a506013342ec0..95ddc80d76f728d37352e263489f8c331912bab8 100644 (file)
--- a/samples/thread/makefile.b32
+++ b/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 thread example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/toolbar/makefile.b32 b/samples/toolbar/makefile.b32
index cb2d9a262a90d44fad4d601552e05624b37d35ba..95ddc80d76f728d37352e263489f8c331912bab8 100644 (file)
--- a/samples/toolbar/makefile.b32
+++ b/samples/toolbar/makefile.b32
@@ -1,63 +1,16 @@
 #
 # File:                makefile.b32
-# Author:      Patrick Halke
-# Created:     1995
+# Author:      Julian Smart
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds 32bit buttonbar example.
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/treectrl/makefile.b32 b/samples/treectrl/makefile.b32
index 618f2c309273892e0c9faf2904c494e9bba0c90b..ebd42c200db218e167a31b169918669b5fa66b7b 100644 (file)
--- a/samples/treectrl/makefile.b32
+++ b/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 treetest example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/typetest/makefile.b32 b/samples/typetest/makefile.b32
index 47c0494fdcd3ed3f5c02c893306c298cad230280..7c366bcdde708558a7058e3208970ea1dc98f432 100644 (file)
--- a/samples/typetest/makefile.b32
+++ b/samples/typetest/makefile.b32
@@ -1,64 +1,16 @@
 #
 # File:                makefile.b32
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1999
 # Updated:     
 # Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds typetest example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/validate/makefile.b32 b/samples/validate/makefile.b32
index c12fa781e2ba6df1bf15f2c9c282a1f16c7edcef..bdad7c2d919d96982f7d3b59a6e3ac0ce5892f3a 100644 (file)
--- a/samples/validate/makefile.b32
+++ b/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 validate example (DOS).
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/samples/wxpoem/makefile.b32 b/samples/wxpoem/makefile.b32
index 835099e8862c24275c5bfd7a26faa60dbd6b1e68..b8eacd84a805bed191afce721d2239bc7cd92c98 100644 (file)
--- a/samples/wxpoem/makefile.b32
+++ b/samples/wxpoem/makefile.b32
@@ -1,64 +1,16 @@
 #
 # File:                makefile.b32
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1999
 # Updated:     
 # Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds wxpoem example
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 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"
-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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 7e7d4f856662f06b181301dd8a01ab418f504182..f99580301def8e4d4a4d43bf8c7c2d8149312783 100644 (file)
--- a/src/common/log.cpp
+++ b/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)

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index f670a131b50083ffb582391e2ae0a51cf15a2097..da985fa3af3060a03bd19dd64cbac5bd643f3dbf 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/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 */

diff --git a/src/makeprog.b32 b/src/makeprog.b32
new file mode 100644 (file)
index 0000000..325dd50
--- /dev/null
+++ b/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
+

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index ba4d4271a38e98c497c94f32b0c0aac218a372f8..bbe4b8940779ba1fc9785ef1dc1a8f5f27cfa4e0 100644 (file)
--- a/src/msw/app.cpp
+++ b/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;
 }

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index eee75f5b2b4fc326292f82d44366feb96d6a7f36..f6e34946eb89e7944d39b16d181d6ce995bd7f97 100644 (file)
--- a/src/msw/makefile.b32
+++ b/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)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 844c66caa8ecab94e6cedaceae2621d2825a03c6..012870182bb4e131ebde2c3e1db14138cba74cee 100644 (file)
--- a/src/msw/makefile.g95
+++ b/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) \

diff --git a/utils/dialoged/src/makefile.b32 b/utils/dialoged/src/makefile.b32
index 8c1fad2317b0c5170dc614c9db060beff11875e4..1479b6f97fe4ea1485170c0ff8b8fab89494bc9a 100644 (file)
--- a/utils/dialoged/src/makefile.b32
+++ b/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
-  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
-
+!include $(WXDIR)\src\makeb32.env
 

diff --git a/utils/tex2rtf/src/makefile.b32 b/utils/tex2rtf/src/makefile.b32
index e22b1345f3b92a882ffb73842326502bce9e1028..8c12e4179d67667c5c16a76066405ae50485e3a4 100644 (file)
--- a/utils/tex2rtf/src/makefile.b32
+++ b/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
-  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
+!include $(WXDIR)\src\makeprog.b32
 

diff --git a/utils/wxtree/src/makefile.b32 b/utils/wxtree/src/makefile.b32
index ac0051a3cf680df640b8de6693bd934521ff29a6..6f257ba8de60388f03d5152505438b0ba1830a8f 100644 (file)
--- a/utils/wxtree/src/makefile.b32
+++ b/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
-LIBTARGET= $(WXLIBDIR)\wxprop.lib
-LIBS=$(WXLIBDIR)\wx32.lib $(LIBTARGET) cw32 import32 ole2w32
+OBJECTS=$(TARGET)
 
-!ifndef DEBUG
-DEBUG=0
-!endif
+!include $(WXDIR)\src\makeprog.b32
 
-!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