From 4bf78aae345c474fe75c0d9df43cf3aaeaf75d57 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 4 Jan 1999 21:51:15 +0000 Subject: [PATCH] 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 | 10 ++++++ distrib/msw/gtk.rsp | 2 +- distrib/msw/motif.rsp | 1 + docs/msw/install.txt | 11 ++++++ include/wx/gtk/textctrl.h | 2 +- include/wx/gtk1/textctrl.h | 2 +- include/wx/log.h | 4 +-- include/wx/motif/setup.h | 3 ++ include/wx/msw/setup.h | 4 +++ include/wx/stubs/setup.h | 3 ++ samples/bombs/makefile.b32 | 60 +++---------------------------- samples/checklst/makefile.b32 | 60 ++++--------------------------- samples/config/makefile.b32 | 56 +++-------------------------- samples/controls/makefile.b32 | 60 ++++--------------------------- samples/db/makefile.b32 | 54 +++------------------------- samples/dialogs/makefile.b32 | 61 ++++--------------------------- samples/dnd/makefile.b32 | 60 ++++--------------------------- samples/docview/makefile.b32 | 64 ++++----------------------------- samples/docvwmdi/makefile.b32 | 64 ++++----------------------------- samples/dynamic/makefile.b32 | 60 ++++--------------------------- samples/fractal/makefile.b32 | 56 +++-------------------------- samples/grid/makefile.b32 | 59 ++++-------------------------- samples/internat/makefile.b32 | 60 ++++--------------------------- samples/joytest/makefile.b32 | 60 ++++--------------------------- samples/layout/makefile.b32 | 59 ++++-------------------------- samples/listctrl/makefile.b32 | 59 ++++-------------------------- samples/mdi/makefile.b32 | 60 ++++--------------------------- samples/memcheck/makefile.b32 | 61 ++++--------------------------- samples/minifram/makefile.b32 | 59 ++++-------------------------- samples/minimal/makefile.b32 | 56 +++-------------------------- samples/minimal/minimal.def | 1 - samples/nativdlg/makefile.b32 | 58 +++--------------------------- samples/notebook/makefile.b32 | 60 ++++--------------------------- samples/oleauto/makefile.b32 | 56 +++-------------------------- samples/ownerdrw/makefile.b32 | 60 ++++--------------------------- samples/printing/makefile.b32 | 59 ++++-------------------------- samples/proplist/makefile.b32 | 56 +++-------------------------- samples/resource/makefile.b32 | 58 +++--------------------------- samples/sashtest/makefile.b32 | 60 ++++--------------------------- samples/splitter/makefile.b32 | 60 ++++--------------------------- samples/tab/makefile.b32 | 60 ++++--------------------------- samples/taskbar/makefile.b32 | 60 ++++--------------------------- samples/thread/makefile.b32 | 60 ++++--------------------------- samples/toolbar/makefile.b32 | 59 ++++-------------------------- samples/treectrl/makefile.b32 | 59 ++++-------------------------- samples/typetest/makefile.b32 | 56 +++-------------------------- samples/validate/makefile.b32 | 62 ++++---------------------------- samples/wxpoem/makefile.b32 | 56 +++-------------------------- src/common/log.cpp | 4 +-- src/generic/dirdlgg.cpp | 5 +++ src/makeprog.b32 | 54 ++++++++++++++++++++++++++++ src/msw/app.cpp | 6 +++- src/msw/makefile.b32 | 23 ++++-------- src/msw/makefile.g95 | 2 +- utils/dialoged/src/makefile.b32 | 35 +----------------- utils/tex2rtf/src/makefile.b32 | 44 +---------------------- utils/wxtree/src/makefile.b32 | 57 ++--------------------------- 57 files changed, 318 insertions(+), 2142 deletions(-) create mode 100644 src/makeprog.b32 diff --git a/distrib/msw/cw.rsp b/distrib/msw/cw.rsp index db34f13bbe..b24d9ed863 100644 --- 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 9fee801c22..995c328ac3 100644 --- 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 356a7bfab7..b1ac434215 100644 --- 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 8a514b029b..f840b14f72 100644 --- 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 cc3ad2a303..da978601d1 100644 --- 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 diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h index cc3ad2a303..da978601d1 100644 --- 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 diff --git a/include/wx/log.h b/include/wx/log.h index 074adb078f..ec849d8df9 100644 --- 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 b1456c86f4..d224299093 100644 --- 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 5ed16a4233..2648217d19 100644 --- 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 9ddf4ee20a..9b2a42e62f 100644 --- 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 0ad7fe88a1..563f61f3b9 100644 --- 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 e591971c85..a6a52a7bbc 100644 --- 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 9efb63a4c6..b9da57631c 100644 --- 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 c216b916ce..8accc1bcfd 100644 --- 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 a634f6ad8b..a9f52b40a7 100644 --- 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 0663799ab8..3102e6b203 100644 --- 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 3c621c9453..ede724b269 100644 --- 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 e9654bdcb4..8f52125c0e 100644 --- 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 e9654bdcb4..8f52125c0e 100644 --- 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 6d46438ffc..d48780825c 100644 --- 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 2dde4c58f8..6000f3994d 100644 --- 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 56b22620bb..95ddc80d76 100644 --- 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 ae72e11b4b..b94db135dc 100644 --- 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 59869b672a..1ab531405a 100644 --- 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 bbb841c22d..efb6636e03 100644 --- 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 21dcf3486f..f2460bdb6c 100644 --- 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 fc59709fe3..145ea61054 100644 --- 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 ba9930981a..a135eb3ab7 100644 --- 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 9f32c974ba..95ddc80d76 100644 --- 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 3d7a859ea5..d1cbad638b 100644 --- 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 060bfe3fce..59f0db711d 100644 --- 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 24926e06ea..d84ffd3a49 100644 --- 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 54ae659bc5..95ddc80d76 100644 --- 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 b34dea7855..46f1832e2f 100644 --- 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 b763889b14..2b6dc5de6a 100644 --- 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 de2e4ce0f2..6e1400dbdf 100644 --- 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 0af0c5f13f..95ddc80d76 100644 --- 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 62381479eb..dc944a8272 100644 --- 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 53b5657332..ce219415a6 100644 --- 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 9835e6dbfb..95ddc80d76 100644 --- 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 305f4cbfc2..95ddc80d76 100644 --- 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 bdaebda7bd..65462aab63 100644 --- 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 92abaf1428..95ddc80d76 100644 --- 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 cb2d9a262a..95ddc80d76 100644 --- 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 618f2c3092..ebd42c200d 100644 --- 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 47c0494fdc..7c366bcdde 100644 --- 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 c12fa781e2..bdad7c2d91 100644 --- 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 835099e886..b8eacd84a8 100644 --- 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 7e7d4f8566..f99580301d 100644 --- 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 f670a131b5..da985fa3af 100644 --- 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 index 0000000000..325dd50e77 --- /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 ba4d4271a3..bbe4b89407 100644 --- 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 eee75f5b2b..f6e34946eb 100644 --- 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 844c66caa8..012870182b 100644 --- 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 8c1fad2317..1479b6f97f 100644 --- 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 e22b1345f3..8c12e4179d 100644 --- 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 ac0051a3cf..6f257ba8de 100644 --- 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 -- 2.45.2