From 8e0080ee4e5ffea768fda11426b6b3bf063c2c98 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 9 Feb 1999 15:37:52 +0000 Subject: [PATCH] Rationalised Cygwin sample makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/bombs/makefile.g95 | 46 +++--------- samples/checklst/makefile.g95 | 39 +++------- samples/config/makefile.g95 | 39 +++------- samples/controls/controls.cpp | 8 ++- samples/controls/makefile.g95 | 39 +++------- samples/dde/client.g95 | 16 +++++ samples/dde/ddesetup.h | 5 ++ samples/dde/makefile.g95 | 41 ++--------- samples/dde/server.g95 | 16 +++++ samples/dialogs/makefile.g95 | 37 +++------- samples/dnd/makefile.g95 | 39 +++------- samples/docview/makefile.g95 | 45 +++--------- samples/docvwmdi/makefile.g95 | 45 +++--------- samples/dynamic/makefile.g95 | 39 +++------- samples/forty/makefile.g95 | 63 +++------------- samples/fractal/makefile.g95 | 39 +++------- samples/grid/makefile.g95 | 39 +++------- samples/internat/makefile.g95 | 38 +++------- samples/joytest/makefile.g95 | 37 +++------- samples/layout/makefile.g95 | 37 +++------- samples/listctrl/makefile.g95 | 39 +++------- samples/makefile.g95 | 130 +++++++++++++++++++--------------- samples/makefile.vc | 7 ++ samples/mdi/makefile.g95 | 37 +++------- samples/memcheck/makefile.g95 | 39 +++------- samples/minifram/makefile.g95 | 42 +++-------- samples/minimal/makefile.g95 | 39 +++------- samples/nativdlg/dialog1.rc | 70 +----------------- samples/nativdlg/makefile.g95 | 38 +++------- samples/notebook/makefile.g95 | 39 +++------- samples/oleauto/makefile.g95 | 39 +++------- samples/ownerdrw/makefile.g95 | 39 +++------- samples/printing/makefile.g95 | 39 +++------- samples/proplist/makefile.g95 | 39 +++------- samples/regtest/makefile.g95 | 39 +++------- samples/resource/makefile.g95 | 38 +++------- samples/sashtest/makefile.g95 | 39 +++------- samples/splitter/makefile.g95 | 41 +++-------- samples/tab/makefile.g95 | 39 +++------- samples/taskbar/makefile.g95 | 39 +++------- samples/thread/makefile.g95 | 39 +++------- samples/toolbar/makefile.g95 | 42 +++-------- samples/treectrl/makefile.g95 | 40 +++-------- samples/typetest/makefile.g95 | 39 +++------- samples/validate/makefile.g95 | 39 +++------- samples/wxpoem/makefile.g95 | 39 +++------- 46 files changed, 474 insertions(+), 1342 deletions(-) create mode 100644 samples/dde/client.g95 create mode 100644 samples/dde/server.g95 diff --git a/samples/bombs/makefile.g95 b/samples/bombs/makefile.g95 index 55743f58b4..43119df900 100644 --- a/samples/bombs/makefile.g95 +++ b/samples/bombs/makefile.g95 @@ -1,44 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for bombs example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/bombs.$(OBJSUFF) $(OBJDIR)/bombs1.$(OBJSUFF) $(OBJDIR)/game.$(OBJSUFF)\ - $(OBJDIR)/bombs_resources.$(OBJSUFF) - -all: $(OBJDIR) bombs$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -bombs$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o bombs$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/bombs.$(OBJSUFF): bombs.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ bombs.$(SRCSUFF) - -$(OBJDIR)/bombs1.$(OBJSUFF): bombs1.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ bombs1.$(SRCSUFF) - -$(OBJDIR)/game.$(OBJSUFF): game.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ game.$(SRCSUFF) +TARGET=bombs +OBJECTS = $(TARGET).o bombs1.o game.o -$(OBJDIR)/bombs_resources.o: bombs.rc - $(RESCOMP) -i bombs.rc -o $(OBJDIR)/bombs_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) bombs$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/checklst/makefile.g95 b/samples/checklst/makefile.g95 index 3fb8e70772..26a281f945 100644 --- a/samples/checklst/makefile.g95 +++ b/samples/checklst/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for checklst example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/checklst.$(OBJSUFF) $(OBJDIR)/checklst_resources.$(OBJSUFF) - -all: $(OBJDIR) checklst$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -checklst$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o checklst$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/checklst.$(OBJSUFF): checklst.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ checklst.$(SRCSUFF) +TARGET=checklst +OBJECTS = $(TARGET).o -$(OBJDIR)/checklst_resources.o: checklst.rc - $(RESCOMP) -i checklst.rc -o $(OBJDIR)/checklst_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) checklst$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/config/makefile.g95 b/samples/config/makefile.g95 index 3f40760ddf..02cba35c7f 100644 --- a/samples/config/makefile.g95 +++ b/samples/config/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for conftest example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/conftest.$(OBJSUFF) $(OBJDIR)/conftest_resources.$(OBJSUFF) - -all: $(OBJDIR) conftest$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -conftest$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o conftest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/conftest.$(OBJSUFF): conftest.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ conftest.$(SRCSUFF) +TARGET=conftest +OBJECTS = $(TARGET).o -$(OBJDIR)/conftest_resources.o: conftest.rc - $(RESCOMP) -i conftest.rc -o $(OBJDIR)/conftest_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) conftest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 2aeb1e00f9..da243509af 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -520,7 +520,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) ) { -#if wxUSE_CLIPBOARD + // We test for wxUSE_DRAG_AND_DROP also, because data objects + // may not be implemented for compilers that can't cope with the OLE + // parts in wxUSE_DRAG_AND_DROP. + +#if wxUSE_CLIPBOARD && wxUSE_DRAG_AND_DROP if (!wxTheClipboard->Open()) { *m_text << "Error opening the clipboard.\n"; @@ -563,7 +567,7 @@ void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) ) void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) ) { -#if wxUSE_CLIPBOARD +#if wxUSE_CLIPBOARD && wxUSE_DRAG_AND_DROP wxString text( m_multitext->GetLineText(0) ); if (text.IsEmpty()) diff --git a/samples/controls/makefile.g95 b/samples/controls/makefile.g95 index 3d2f52233f..28a81c25cf 100644 --- a/samples/controls/makefile.g95 +++ b/samples/controls/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for controls example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/controls.$(OBJSUFF) $(OBJDIR)/controls_resources.$(OBJSUFF) - -all: $(OBJDIR) controls$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -controls$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o controls$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/controls.$(OBJSUFF): controls.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ controls.$(SRCSUFF) +TARGET=controls +OBJECTS = $(TARGET).o -$(OBJDIR)/controls_resources.o: controls.rc - $(RESCOMP) -i controls.rc -o $(OBJDIR)/controls_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) controls$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/dde/client.g95 b/samples/dde/client.g95 new file mode 100644 index 0000000000..260c61cfd6 --- /dev/null +++ b/samples/dde/client.g95 @@ -0,0 +1,16 @@ +# +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 +# +# Makefile for wxWindows sample (Cygwin/Mingw32). + +WXDIR = ../.. + +TARGET=client +OBJECTS = $(TARGET).o + +include $(WXDIR)/src/makeprog.g95 + diff --git a/samples/dde/ddesetup.h b/samples/dde/ddesetup.h index 00c6cc3b23..caf383930c 100644 --- a/samples/dde/ddesetup.h +++ b/samples/dde/ddesetup.h @@ -15,7 +15,12 @@ */ // If 1, use real DDE. If 0, use TCP/IP + +#ifdef __WXMSW__ +#define wxUSE_DDE_FOR_SAMPLE 1 +#else #define wxUSE_DDE_FOR_SAMPLE 0 +#endif #if wxUSE_DDE_FOR_SAMPLE diff --git a/samples/dde/makefile.g95 b/samples/dde/makefile.g95 index 8139390064..40343ddace 100644 --- a/samples/dde/makefile.g95 +++ b/samples/dde/makefile.g95 @@ -1,5 +1,5 @@ # -# File: makefile.unx +# File: makefile.g95 # Author: Julian Smart # Created: 1993 # Updated: @@ -9,38 +9,11 @@ # # Makefile for server/client example (UNIX). -WXDIR = ../.. - -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS=$(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF)\ - $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) - -all: $(OBJDIR) server$(GUISUFFIX) client$(GUISUFFIX) - - -$(OBJDIR): - mkdir $(OBJDIR) - -server$(GUISUFFIX): $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(WXLIB) - $(CC) $(LDFLAGS) -o server$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(LDLIBS) - -$(OBJDIR)/server.$(OBJSUFF): server.$(SRCSUFF) server.h - $(CC) -c $(CPPFLAGS) -o $@ server.$(SRCSUFF) - -client$(GUISUFFIX): $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(WXLIB) - $(CC) $(LDFLAGS) -o client$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(LDLIBS) - -$(OBJDIR)/client.$(OBJSUFF): client.$(SRCSUFF) client.h - $(CC) -c $(CPPFLAGS) -o $@ client.$(SRCSUFF) - -$(OBJDIR)/server_resources.o: server.rc - $(RESCOMP) -i server.rc -o $(OBJDIR)/server_resources.o $(RESFLAGS) - -$(OBJDIR)/client_resources.o: client.rc - $(RESCOMP) -i client.rc -o $(OBJDIR)/client_resources.o $(RESFLAGS) +all: + make -f client.g95 all + make -f server.g95 all clean: - rm -f $(OBJECTS) server$(GUISUFFIX).exe client$(GUISUFFIX).exe core *.rsc *.res + make -f client.g95 clean + make -f server.g95 clean + diff --git a/samples/dde/server.g95 b/samples/dde/server.g95 new file mode 100644 index 0000000000..48e622cc59 --- /dev/null +++ b/samples/dde/server.g95 @@ -0,0 +1,16 @@ +# +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 +# +# Makefile for wxWindows sample (Cygwin/Mingw32). + +WXDIR = ../.. + +TARGET=server +OBJECTS = $(TARGET).o + +include $(WXDIR)/src/makeprog.g95 + diff --git a/samples/dialogs/makefile.g95 b/samples/dialogs/makefile.g95 index c579ce37e1..a9ff2650cf 100644 --- a/samples/dialogs/makefile.g95 +++ b/samples/dialogs/makefile.g95 @@ -1,35 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for dialogs example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/dialogs.$(OBJSUFF) $(OBJDIR)/dialogs_resources.$(OBJSUFF) - -all: $(OBJDIR) dialogs$(GUISUFFIX) - -$(OBJDIR): - mkdir $(OBJDIR) - -dialogs$(GUISUFFIX): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o dialogs$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/dialogs.$(OBJSUFF): dialogs.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ dialogs.$(SRCSUFF) +TARGET=dialogs +OBJECTS = $(TARGET).o -$(OBJDIR)/dialogs_resources.o: dialogs.rc - $(RESCOMP) -i dialogs.rc -o $(OBJDIR)/dialogs_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) dialogs$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/dnd/makefile.g95 b/samples/dnd/makefile.g95 index d62f860121..f9ff5dabc5 100644 --- a/samples/dnd/makefile.g95 +++ b/samples/dnd/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for dnd example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/dnd.$(OBJSUFF) $(OBJDIR)/dnd_resources.$(OBJSUFF) - -all: $(OBJDIR) dnd$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -dnd$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o dnd$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/dnd.$(OBJSUFF): dnd.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ dnd.$(SRCSUFF) +TARGET=dnd +OBJECTS = $(TARGET).o -$(OBJDIR)/dnd_resources.o: dnd.rc - $(RESCOMP) -i dnd.rc -o $(OBJDIR)/dnd_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) dnd$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/docview/makefile.g95 b/samples/docview/makefile.g95 index 5fe3bf52db..fbb3e56c57 100644 --- a/samples/docview/makefile.g95 +++ b/samples/docview/makefile.g95 @@ -1,43 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for docview example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/docview.$(OBJSUFF) $(OBJDIR)/view.$(OBJSUFF) $(OBJDIR)/doc.$(OBJSUFF)\ - $(OBJDIR)/docview_resources.$(OBJSUFF) - - -all: $(OBJDIR) docview$(GUISUFFIX) - -$(OBJDIR): - mkdir $(OBJDIR) - -docview$(GUISUFFIX): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o docview$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(XVIEW_LINK) $(LDLIBS) - -$(OBJDIR)/docview.$(OBJSUFF): docview.$(SRCSUFF) docview.h doc.h view.h - $(CC) -c $(CPPFLAGS) -o $@ docview.$(SRCSUFF) - -$(OBJDIR)/doc.$(OBJSUFF): doc.$(SRCSUFF) doc.h - $(CC) -c $(CPPFLAGS) -o $@ doc.$(SRCSUFF) - -$(OBJDIR)/view.$(OBJSUFF): view.$(SRCSUFF) view.h - $(CC) -c $(CPPFLAGS) -o $@ view.$(SRCSUFF) +TARGET=docview +OBJECTS = $(TARGET).o view.o doc.o -$(OBJDIR)/docview_resources.o: docview.rc - $(RESCOMP) -i docview.rc -o $(OBJDIR)/docview_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) docview$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/docvwmdi/makefile.g95 b/samples/docvwmdi/makefile.g95 index 5fe3bf52db..fbb3e56c57 100644 --- a/samples/docvwmdi/makefile.g95 +++ b/samples/docvwmdi/makefile.g95 @@ -1,43 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for docview example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/docview.$(OBJSUFF) $(OBJDIR)/view.$(OBJSUFF) $(OBJDIR)/doc.$(OBJSUFF)\ - $(OBJDIR)/docview_resources.$(OBJSUFF) - - -all: $(OBJDIR) docview$(GUISUFFIX) - -$(OBJDIR): - mkdir $(OBJDIR) - -docview$(GUISUFFIX): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o docview$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(XVIEW_LINK) $(LDLIBS) - -$(OBJDIR)/docview.$(OBJSUFF): docview.$(SRCSUFF) docview.h doc.h view.h - $(CC) -c $(CPPFLAGS) -o $@ docview.$(SRCSUFF) - -$(OBJDIR)/doc.$(OBJSUFF): doc.$(SRCSUFF) doc.h - $(CC) -c $(CPPFLAGS) -o $@ doc.$(SRCSUFF) - -$(OBJDIR)/view.$(OBJSUFF): view.$(SRCSUFF) view.h - $(CC) -c $(CPPFLAGS) -o $@ view.$(SRCSUFF) +TARGET=docview +OBJECTS = $(TARGET).o view.o doc.o -$(OBJDIR)/docview_resources.o: docview.rc - $(RESCOMP) -i docview.rc -o $(OBJDIR)/docview_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) docview$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/dynamic/makefile.g95 b/samples/dynamic/makefile.g95 index c5f0d229fc..d955141bd6 100644 --- a/samples/dynamic/makefile.g95 +++ b/samples/dynamic/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for dynamic example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/dynamic.$(OBJSUFF) $(OBJDIR)/dynamic_resources.$(OBJSUFF) - -all: $(OBJDIR) dynamic$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -dynamic$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o dynamic$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/dynamic.$(OBJSUFF): dynamic.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ dynamic.$(SRCSUFF) +TARGET=dynamic +OBJECTS = $(TARGET).o -$(OBJDIR)/dynamic_resources.o: dynamic.rc - $(RESCOMP) -i dynamic.rc -o $(OBJDIR)/dynamic_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) dynamic$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/forty/makefile.g95 b/samples/forty/makefile.g95 index 4e61690c60..7f750c2de7 100644 --- a/samples/forty/makefile.g95 +++ b/samples/forty/makefile.g95 @@ -1,61 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for Forty Thieves example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/forty.$(OBJSUFF) $(OBJDIR)/canvas.$(OBJSUFF) $(OBJDIR)/card.$(OBJSUFF)\ - $(OBJDIR)/game.$(OBJSUFF) $(OBJDIR)/pile.$(OBJSUFF) $(OBJDIR)/playerdg.$(OBJSUFF)\ - $(OBJDIR)/scoredg.$(OBJSUFF) $(OBJDIR)/scorefil.$(OBJSUFF)\ - $(OBJDIR)/forty_resources.$(OBJSUFF) - -all: $(OBJDIR) forty$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -forty$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o forty$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/forty.$(OBJSUFF): forty.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ forty.$(SRCSUFF) - -$(OBJDIR)/canvas.$(OBJSUFF): canvas.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ canvas.$(SRCSUFF) - -$(OBJDIR)/card.$(OBJSUFF): card.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ card.$(SRCSUFF) - -$(OBJDIR)/playerdg.$(OBJSUFF): playerdg.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ playerdg.$(SRCSUFF) - -$(OBJDIR)/scoredg.$(OBJSUFF): scoredg.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ scoredg.$(SRCSUFF) - -$(OBJDIR)/scorefil.$(OBJSUFF): scorefil.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ scorefil.$(SRCSUFF) - -$(OBJDIR)/pile.$(OBJSUFF): pile.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ pile.$(SRCSUFF) - -$(OBJDIR)/game.$(OBJSUFF): game.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ game.$(SRCSUFF) +TARGET=forty +OBJECTS = $(TARGET).o canvas.o card.o game.o pile.o playerdg.o scoredg.o scorefil.o -$(OBJDIR)/forty_resources.o: forty.rc - $(RESCOMP) -i forty.rc -o $(OBJDIR)/forty_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) forty$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/fractal/makefile.g95 b/samples/fractal/makefile.g95 index 041b2bad36..09d3d1f66e 100644 --- a/samples/fractal/makefile.g95 +++ b/samples/fractal/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for fractal example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/fractal.$(OBJSUFF) $(OBJDIR)/fractal_resources.$(OBJSUFF) - -all: $(OBJDIR) fractal$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -fractal$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o fractal$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/fractal.$(OBJSUFF): fractal.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ fractal.$(SRCSUFF) +TARGET=fractal +OBJECTS = $(TARGET).o -$(OBJDIR)/fractal_resources.o: fractal.rc - $(RESCOMP) -i fractal.rc -o $(OBJDIR)/fractal_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) fractal$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/grid/makefile.g95 b/samples/grid/makefile.g95 index 32f8af5e2f..b4a920f047 100644 --- a/samples/grid/makefile.g95 +++ b/samples/grid/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for grid example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF) - -all: $(OBJDIR) test$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -test$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/test.$(OBJSUFF): test.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF) +TARGET=test +OBJECTS = $(TARGET).o -$(OBJDIR)/test_resources.o: test.rc - $(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) test$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/internat/makefile.g95 b/samples/internat/makefile.g95 index c877d3ca8c..262554b63f 100644 --- a/samples/internat/makefile.g95 +++ b/samples/internat/makefile.g95 @@ -1,36 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for internat example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/internat.$(OBJSUFF) - -all: $(OBJDIR) internat$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -internat$(GUISUFFIX)$(EXESUFF): $(OBJDIR)/internat.$(OBJSUFF) internat.res internat.$(RSCSUFF) $(WXLIB) - $(CC) $(LDFLAGS) -o internat$(GUISUFFIX)$(EXESUFF) internat.$(RSCSUFF) $(OBJDIR)/internat.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS) - -$(OBJDIR)/internat.$(OBJSUFF): internat.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ internat.$(SRCSUFF) +TARGET=internat +OBJECTS = $(TARGET).o -internat.res: internat.rc +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) internat$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/joytest/makefile.g95 b/samples/joytest/makefile.g95 index 8eef77f7cf..565c1a9bfb 100644 --- a/samples/joytest/makefile.g95 +++ b/samples/joytest/makefile.g95 @@ -1,35 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for joytest example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/joytest.$(OBJSUFF) $(OBJDIR)/joytest_resources.$(OBJSUFF) - -all: $(OBJDIR) joytest$(GUISUFFIX) - -$(OBJDIR): - mkdir $(OBJDIR) - -joytest$(GUISUFFIX): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o joytest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/joytest.$(OBJSUFF): joytest.$(SRCSUFF) joytest.h - $(CC) -c $(CPPFLAGS) -o $@ joytest.$(SRCSUFF) +TARGET=joytest +OBJECTS = $(TARGET).o -$(OBJDIR)/joytest_resources.o: joytest.rc - $(RESCOMP) -i joytest.rc -o $(OBJDIR)/joytest_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) joytest$(GUISUFFIX).exe core *.res *.rsc diff --git a/samples/layout/makefile.g95 b/samples/layout/makefile.g95 index df9f97e246..e4f5ffd5ee 100644 --- a/samples/layout/makefile.g95 +++ b/samples/layout/makefile.g95 @@ -1,35 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for layout example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS=$(OBJDIR)/layout.$(OBJSUFF) $(OBJDIR)/layout_resources.o - -all: $(OBJDIR) layout.exe - -$(OBJDIR): - mkdir $(OBJDIR) - -layout.exe: $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o layout$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/layout.$(OBJSUFF): layout.$(SRCSUFF) layout.h - $(CC) -c $(CPPFLAGS) -o $@ layout.$(SRCSUFF) +TARGET=layout +OBJECTS = $(TARGET).o -$(OBJDIR)/layout_resources.o: layout.rc - $(RESCOMP) -i layout.rc -o $(OBJDIR)/layout_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) layout$(GUISUFFIX).exe core *.res *.rsc diff --git a/samples/listctrl/makefile.g95 b/samples/listctrl/makefile.g95 index 92ff4c4c09..248951e95a 100644 --- a/samples/listctrl/makefile.g95 +++ b/samples/listctrl/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for listtest example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/listtest.$(OBJSUFF) $(OBJDIR)/listtest_resources.$(OBJSUFF) - -all: $(OBJDIR) listtest$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -listtest$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o listtest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/listtest.$(OBJSUFF): listtest.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ listtest.$(SRCSUFF) +TARGET=listtest +OBJECTS = $(TARGET).o -$(OBJDIR)/listtest_resources.o: listtest.rc - $(RESCOMP) -i listtest.rc -o $(OBJDIR)/listtest_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) listtest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/makefile.g95 b/samples/makefile.g95 index 8b5be576cb..0a5c2c4cc3 100644 --- a/samples/makefile.g95 +++ b/samples/makefile.g95 @@ -7,72 +7,88 @@ # # "%W% %G%" # -# Makefile : Builds samples for Win95, GnuWin32 +# Makefile : Builds samples for Win95, Cygwin # info # Set WXDIR for your system -SHELL=cmd.exe +# SHELL=cmd.exe WXDIR = .. THISDIR=$(WXDIR)/samples all: - $(MAKE) -C $(WXDIR)/samples/bombs -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/fractal -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/splitter -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/resource -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/controls -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/listctrl -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/treectrl -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/validate -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/mdi -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/minimal -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/layout -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/printing -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/proplist -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/toolbar -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/dialogs -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/docview -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/docvwmdi -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/sashtest -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/controls -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/nativdlg -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/grid -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/internat -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/checklst -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/dnd -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/ownerdrw -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/joytest -f makefile.g95 - $(MAKE) -C $(WXDIR)/samples/memcheck -f makefile.g95 -# $(MAKE) -C $(WXDIR)/samples/regtest -f makefile.g95 + cd $(WXDIR)/samples/bombs; make -f makefile.g95 + cd $(WXDIR)/samples/fractal; make -f makefile.g95 + cd $(WXDIR)/samples/splitter; make -f makefile.g95 + cd $(WXDIR)/samples/resource; make -f makefile.g95 + cd $(WXDIR)/samples/controls; make -f makefile.g95 + cd $(WXDIR)/samples/listctrl; make -f makefile.g95 + cd $(WXDIR)/samples/treectrl; make -f makefile.g95 + cd $(WXDIR)/samples/validate; make -f makefile.g95 + cd $(WXDIR)/samples/mdi; make -f makefile.g95 + cd $(WXDIR)/samples/minimal; make -f makefile.g95 + cd $(WXDIR)/samples/layout; make -f makefile.g95 + cd $(WXDIR)/samples/printing; make -f makefile.g95 + cd $(WXDIR)/samples/proplist; make -f makefile.g95 + cd $(WXDIR)/samples/toolbar; make -f makefile.g95 + cd $(WXDIR)/samples/dialogs; make -f makefile.g95 + cd $(WXDIR)/samples/docview; make -f makefile.g95 + cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95 + cd $(WXDIR)/samples/sashtest; make -f makefile.g95 + cd $(WXDIR)/samples/controls; make -f makefile.g95 + cd $(WXDIR)/samples/nativdlg; make -f makefile.g95 + cd $(WXDIR)/samples/grid; make -f makefile.g95 + cd $(WXDIR)/samples/internat; make -f makefile.g95 + cd $(WXDIR)/samples/checklst; make -f makefile.g95 + cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95 + cd $(WXDIR)/samples/joytest; make -f makefile.g95 + cd $(WXDIR)/samples/memcheck; make -f makefile.g95 + cd $(WXDIR)/samples/image; make -f makefile.g95 + cd $(WXDIR)/samples/wxpoem; make -f makefile.g95 + cd $(WXDIR)/samples/notebook; make -f makefile.g95 + cd $(WXDIR)/samples/thread; make -f makefile.g95 + cd $(WXDIR)/samples/minifram; make -f makefile.g95 + cd $(WXDIR)/samples/forty; make -f makefile.g95 + cd $(WXDIR)/samples/dde; make -f client.g95 + cd $(WXDIR)/samples/dde; make -f server.g95 +# cd $(WXDIR)/samples/dnd; make -f makefile.g95 +# cd $(WXDIR)/samples/regtest; make -f makefile.g95 clean: - $(MAKE) -C $(WXDIR)/samples/bombs -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/fractal -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/splitter -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/mdi -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/minimal -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/layout -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/printing -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/proplist -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/toolbar -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/dialogs -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/resource -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/listctrl -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/treectrl -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/validate -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/docview -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/docvwmdi -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/sashtest -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/controls -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/nativdlg -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/grid -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/internat -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/checklst -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/dnd -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/ownerdrw -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/regtest -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/joytest -f makefile.g95 clean - $(MAKE) -C $(WXDIR)/samples/memcheck -f makefile.g95 clean + cd $(WXDIR)/samples/bombs; make -f makefile.g95 clean + cd $(WXDIR)/samples/fractal; make -f makefile.g95 clean + cd $(WXDIR)/samples/splitter; make -f makefile.g95 clean + cd $(WXDIR)/samples/mdi; make -f makefile.g95 clean + cd $(WXDIR)/samples/minimal; make -f makefile.g95 clean + cd $(WXDIR)/samples/layout; make -f makefile.g95 clean + cd $(WXDIR)/samples/printing; make -f makefile.g95 clean + cd $(WXDIR)/samples/proplist; make -f makefile.g95 clean + cd $(WXDIR)/samples/toolbar; make -f makefile.g95 clean + cd $(WXDIR)/samples/dialogs; make -f makefile.g95 clean + cd $(WXDIR)/samples/resource; make -f makefile.g95 clean + cd $(WXDIR)/samples/listctrl; make -f makefile.g95 clean + cd $(WXDIR)/samples/treectrl; make -f makefile.g95 clean + cd $(WXDIR)/samples/validate; make -f makefile.g95 clean + cd $(WXDIR)/samples/docview; make -f makefile.g95 clean + cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95 clean + cd $(WXDIR)/samples/sashtest; make -f makefile.g95 clean + cd $(WXDIR)/samples/controls; make -f makefile.g95 clean + cd $(WXDIR)/samples/nativdlg; make -f makefile.g95 clean + cd $(WXDIR)/samples/grid; make -f makefile.g95 clean + cd $(WXDIR)/samples/internat; make -f makefile.g95 clean + cd $(WXDIR)/samples/checklst; make -f makefile.g95 clean + cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95 clean + cd $(WXDIR)/samples/regtest; make -f makefile.g95 clean + cd $(WXDIR)/samples/joytest; make -f makefile.g95 clean + cd $(WXDIR)/samples/memcheck; make -f makefile.g95 clean + cd $(WXDIR)/samples/image; make -f makefile.g95 clean + cd $(WXDIR)/samples/wxpoem; make -f makefile.g95 clean + cd $(WXDIR)/samples/notebook; make -f makefile.g95 clean + cd $(WXDIR)/samples/thread; make -f makefile.g95 clean + cd $(WXDIR)/samples/minifram; make -f makefile.g95 clean + cd $(WXDIR)/samples/forty; make -f makefile.g95 clean + cd $(WXDIR)/samples/dnd; make -f makefile.g95 clean + cd $(WXDIR)/samples/dde; make -f client.g95 clean + cd $(WXDIR)/samples/dde; make -f server.g95 clean diff --git a/samples/makefile.vc b/samples/makefile.vc index e016ae83ef..a3efddc975 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -88,6 +88,9 @@ all: nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\image nmake -f makefile.vc FINAL=$(FINAL) + cd $(WXDIR)\samples\dde + nmake -f client.vc FINAL=$(FINAL) + nmake -f server.vc FINAL=$(FINAL) # cd $(WXDIR)\samples\regtest # nmake -f makefile.vc FINAL=$(FINAL) @@ -156,4 +159,8 @@ clean: nmake -f makefile.vc clean cd $(WXDIR)\samples\image nmake -f makefile.vc clean + cd $(WXDIR)\samples\dde + nmake -f client.vc clean + nmake -f server.vc clean + cd $(WXDIR)\samples diff --git a/samples/mdi/makefile.g95 b/samples/mdi/makefile.g95 index 045751ea89..65e2af593f 100644 --- a/samples/mdi/makefile.g95 +++ b/samples/mdi/makefile.g95 @@ -1,35 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for mdi example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/mdi.$(OBJSUFF) $(OBJDIR)/mdi_resources.$(OBJSUFF) - -all: $(OBJDIR) mdi.exe - -$(OBJDIR): - mkdir $(OBJDIR) - -mdi.exe: $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o mdi.exe $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/mdi.$(OBJSUFF): mdi.$(SRCSUFF) mdi.h - $(CC) -c $(CPPFLAGS) -o $@ mdi.$(SRCSUFF) +TARGET=mdi +OBJECTS = $(TARGET).o -$(OBJDIR)/mdi_resources.o: mdi.rc - $(RESCOMP) -i mdi.rc -o $(OBJDIR)/mdi_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) mdi$(GUISUFFIX).exe core *.res *.rsc diff --git a/samples/memcheck/makefile.g95 b/samples/memcheck/makefile.g95 index 468c694dd6..3749343d82 100644 --- a/samples/memcheck/makefile.g95 +++ b/samples/memcheck/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for minimal example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/memcheck.$(OBJSUFF) $(OBJDIR)/memcheck_resources.$(OBJSUFF) - -all: $(OBJDIR) memcheck$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -memcheck$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o memcheck$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/memcheck.$(OBJSUFF): memcheck.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ memcheck.$(SRCSUFF) +TARGET=memcheck +OBJECTS = $(TARGET).o -$(OBJDIR)/memcheck_resources.o: memcheck.rc - $(RESCOMP) -i memcheck.rc -o $(OBJDIR)/memcheck_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) memcheck$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/minifram/makefile.g95 b/samples/minifram/makefile.g95 index a16ac0faec..b4a920f047 100644 --- a/samples/minifram/makefile.g95 +++ b/samples/minifram/makefile.g95 @@ -1,40 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for Buttonbar example (UNIX). -# Change the WXDIR directory, and CPPFLAGS and LDFLAGS, for your system. +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -TESTOBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF) -TESTPROGRAM = test$(GUISUFFIX) - -all: $(OBJDIR) $(TESTPROGRAM) - -demo: $(TESTPROGRAM) - -$(OBJDIR): - mkdir $(OBJDIR) - -$(OBJDIR)/test.$(OBJSUFF): test.h test.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF) - -$(TESTPROGRAM): $(TESTOBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(TESTOBJECTS) $(LDLIBS) - -$(OBJDIR)/test_resources.o: test.rc - $(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS) +TARGET=test +OBJECTS = $(TARGET).o -clean: - rm -f $(OBJECTS) test$(GUISUFFIX).exe $(TESTOBJECTS) core *.res *.rsc +include $(WXDIR)/src/makeprog.g95 diff --git a/samples/minimal/makefile.g95 b/samples/minimal/makefile.g95 index baa1edd9c5..f030c04367 100644 --- a/samples/minimal/makefile.g95 +++ b/samples/minimal/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for minimal example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF) $(OBJDIR)/minimal_resources.$(OBJSUFF) - -all: $(OBJDIR) minimal$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -minimal$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o minimal$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/minimal.$(OBJSUFF): minimal.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF) +TARGET=minimal +OBJECTS = $(TARGET).o -$(OBJDIR)/minimal_resources.o: minimal.rc - $(RESCOMP) $(RCINPUTSWITCH) minimal.rc $(RCOUTPUTSWITCH) $(OBJDIR)/minimal_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) minimal$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/nativdlg/dialog1.rc b/samples/nativdlg/dialog1.rc index 11c75fe589..54c00b55a9 100644 --- a/samples/nativdlg/dialog1.rc +++ b/samples/nativdlg/dialog1.rc @@ -13,7 +13,7 @@ #define __WIN95__ #endif -#ifdef __MINGW32__ +#ifdef __GNUWIN32__ #define wxID_OK 5100 #define wxID_CANCEL 5101 #define wxID_APPLY 5102 @@ -27,20 +27,11 @@ #include "resource.h" -#ifndef __MINGW32__ +#if !defined(__GNUWIN32__) #include #endif #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -// #include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - ///////////////////////////////////////////////////////////////////////////// // English (U.K.) resources @@ -80,63 +71,6 @@ BEGIN 10,14 END - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - dialog1, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 264 - TOPMARGIN, 7 - BOTTOMMARGIN, 165 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - #endif // English (U.K.) resources ///////////////////////////////////////////////////////////////////////////// - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/samples/nativdlg/makefile.g95 b/samples/nativdlg/makefile.g95 index 018f915f18..3758852311 100644 --- a/samples/nativdlg/makefile.g95 +++ b/samples/nativdlg/makefile.g95 @@ -1,36 +1,16 @@ # -# File: makefile.g95 -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for nativdlg example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS=$(OBJDIR)/nativdlg.$(OBJSUFF) $(OBJDIR)/nativdlg_resources.$(OBJSUFF) - -all: $(OBJDIR) nativdlg$(GUISUFFIX) - -$(OBJDIR): - mkdir $(OBJDIR) - -$(OBJDIR)/nativdlg.$(OBJSUFF): nativdlg.$(SRCSUFF) nativdlg.h - $(CC) -c $(CPPFLAGS) -o $@ nativdlg.$(SRCSUFF) - -nativdlg$(GUISUFFIX): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o nativdlg$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/nativdlg_resources.o: nativdlg.rc - $(RESCOMP) -i nativdlg.rc -o $(OBJDIR)/nativdlg_resources.o $(RESFLAGS) +TARGET=nativdlg +OBJECTS = $(TARGET).o -clean: - rm -f $(OBJECTS) nativdlg$(GUISUFFIX).exe core *.rsc *.res +include $(WXDIR)/src/makeprog.g95 diff --git a/samples/notebook/makefile.g95 b/samples/notebook/makefile.g95 index 6cae0fbe1d..b4a920f047 100644 --- a/samples/notebook/makefile.g95 +++ b/samples/notebook/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for notebook example +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF) - -all: $(OBJDIR) test$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -test$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/test.$(OBJSUFF): test.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF) +TARGET=test +OBJECTS = $(TARGET).o -$(OBJDIR)/test_resources.o: test.rc - $(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) test$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/oleauto/makefile.g95 b/samples/oleauto/makefile.g95 index 9df465495c..8472fc3546 100644 --- a/samples/oleauto/makefile.g95 +++ b/samples/oleauto/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for oleauto example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/oleauto.$(OBJSUFF) $(OBJDIR)/oleauto_resources.$(OBJSUFF) - -all: $(OBJDIR) oleauto$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -oleauto$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o oleauto$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/oleauto.$(OBJSUFF): oleauto.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ oleauto.$(SRCSUFF) +TARGET=oleauto +OBJECTS = $(TARGET).o -$(OBJDIR)/oleauto_resources.o: oleauto.rc - $(RESCOMP) -i oleauto.rc -o $(OBJDIR)/oleauto_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) oleauto$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/ownerdrw/makefile.g95 b/samples/ownerdrw/makefile.g95 index c821885cc3..3d807bd7a6 100644 --- a/samples/ownerdrw/makefile.g95 +++ b/samples/ownerdrw/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for ownerdrw example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/ownerdrw.$(OBJSUFF) $(OBJDIR)/ownerdrw_resources.$(OBJSUFF) - -all: $(OBJDIR) ownerdrw$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -ownerdrw$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o ownerdrw$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/ownerdrw.$(OBJSUFF): ownerdrw.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ ownerdrw.$(SRCSUFF) +TARGET=ownerdrw +OBJECTS = $(TARGET).o -$(OBJDIR)/ownerdrw_resources.o: ownerdrw.rc - $(RESCOMP) -i ownerdrw.rc -o $(OBJDIR)/ownerdrw_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) ownerdrw$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/printing/makefile.g95 b/samples/printing/makefile.g95 index 4746b7aabe..0af39c2cfa 100644 --- a/samples/printing/makefile.g95 +++ b/samples/printing/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.g95 -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for printing example (UNIX). PRINTING NOT SUPPORTED -# UNDER UNIX YET: THIS IS A PLACEHOLDER. +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS=$(OBJDIR)/printing.$(OBJSUFF) $(OBJDIR)/printing_resources.$(OBJSUFF) - -all: $(OBJDIR) printing$(GUISUFFIX) - -$(OBJDIR): - mkdir $(OBJDIR) - -printing.exe: $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o printing$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/printing.$(OBJSUFF): printing.$(SRCSUFF) printing.h - $(CC) -c $(CPPFLAGS) -o $@ printing.$(SRCSUFF) - -$(OBJDIR)/printing_resources.o: printing.rc - $(RESCOMP) -i printing.rc -o $(OBJDIR)/printing_resources.o $(RESFLAGS) +TARGET=printing +OBJECTS = $(TARGET).o -clean: - rm -f $(OBJECTS) printing$(GUISUFFIX).exe core *.res *.rsc +include $(WXDIR)/src/makeprog.g95 diff --git a/samples/proplist/makefile.g95 b/samples/proplist/makefile.g95 index fa8c6fbd2f..b4a920f047 100644 --- a/samples/proplist/makefile.g95 +++ b/samples/proplist/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for test example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF) - -all: $(OBJDIR) test$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -test$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/test.$(OBJSUFF): test.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF) +TARGET=test +OBJECTS = $(TARGET).o -$(OBJDIR)/test_resources.o: test.rc - $(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) test$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/regtest/makefile.g95 b/samples/regtest/makefile.g95 index 5dc5b47810..2d8022c869 100644 --- a/samples/regtest/makefile.g95 +++ b/samples/regtest/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for regtest example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/regtest.$(OBJSUFF) $(OBJDIR)/regtest_resources.$(OBJSUFF) - -all: $(OBJDIR) regtest$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -regtest$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o regtest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/regtest.$(OBJSUFF): regtest.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ regtest.$(SRCSUFF) +TARGET=regtest +OBJECTS = $(TARGET).o -$(OBJDIR)/regtest_resources.o: regtest.rc - $(RESCOMP) -i regtest.rc -o $(OBJDIR)/regtest_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) regtest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/resource/makefile.g95 b/samples/resource/makefile.g95 index d9ad8d610a..a8ef75d70b 100644 --- a/samples/resource/makefile.g95 +++ b/samples/resource/makefile.g95 @@ -1,36 +1,16 @@ # -# File: makefile.g95 -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for resource example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS=$(OBJDIR)/resource.$(OBJSUFF) $(OBJDIR)/resource_resources.$(OBJSUFF) - -all: $(OBJDIR) resource.exe - -$(OBJDIR): - mkdir $(OBJDIR) - -$(OBJDIR)/resource.$(OBJSUFF): resource.$(SRCSUFF) resource.h - $(CC) -c $(CPPFLAGS) -o $@ resource.$(SRCSUFF) - -resource.exe: $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o resource$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/resource_resources.o: resource.rc - $(RESCOMP) -i resource.rc -o $(OBJDIR)/resource_resources.o $(RESFLAGS) +TARGET=resource +OBJECTS = $(TARGET).o -clean: - rm -f $(OBJECTS) resource$(GUISUFFIX).exe core *.rsc *.res +include $(WXDIR)/src/makeprog.g95 diff --git a/samples/sashtest/makefile.g95 b/samples/sashtest/makefile.g95 index 7d5feb51e8..868594ea98 100644 --- a/samples/sashtest/makefile.g95 +++ b/samples/sashtest/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for sashtest example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/sashtest.$(OBJSUFF) $(OBJDIR)/sashtest_resources.$(OBJSUFF) - -all: $(OBJDIR) sashtest$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -sashtest$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o sashtest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/sashtest.$(OBJSUFF): sashtest.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ sashtest.$(SRCSUFF) +TARGET=sashtest +OBJECTS = $(TARGET).o -$(OBJDIR)/sashtest_resources.o: sashtest.rc - $(RESCOMP) -i sashtest.rc -o $(OBJDIR)/sashtest_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) sashtest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/splitter/makefile.g95 b/samples/splitter/makefile.g95 index 597f7d9a40..b4a920f047 100644 --- a/samples/splitter/makefile.g95 +++ b/samples/splitter/makefile.g95 @@ -1,39 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for splitter example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF) - -all: $(OBJDIR) test$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -test$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/test.$(OBJSUFF): test.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF) - -$(OBJDIR)/test_resources.o: test.rc - $(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS) - -clean: - rm -f $(OBJECTS) test$(GUISUFFIX).exe core *.rsc *.res +TARGET=test +OBJECTS = $(TARGET).o +include $(WXDIR)/src/makeprog.g95 diff --git a/samples/tab/makefile.g95 b/samples/tab/makefile.g95 index 75576c053a..b4a920f047 100644 --- a/samples/tab/makefile.g95 +++ b/samples/tab/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for tab example +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF) - -all: $(OBJDIR) test$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -test$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/test.$(OBJSUFF): test.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF) +TARGET=test +OBJECTS = $(TARGET).o -$(OBJDIR)/test_resources.o: test.rc - $(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) test$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/taskbar/makefile.g95 b/samples/taskbar/makefile.g95 index a26fef6cd7..6243ce86d1 100644 --- a/samples/taskbar/makefile.g95 +++ b/samples/taskbar/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for taskbar example +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/tbtest.$(OBJSUFF) $(OBJDIR)/tbtest_resources.$(OBJSUFF) - -all: $(OBJDIR) tbtest$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -tbtest$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o tbtest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/tbtest.$(OBJSUFF): tbtest.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ tbtest.$(SRCSUFF) +TARGET=tbtest +OBJECTS = $(TARGET).o -$(OBJDIR)/tbtest_resources.o: tbtest.rc - $(RESCOMP) -i tbtest.rc -o $(OBJDIR)/tbtest_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) tbtest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/thread/makefile.g95 b/samples/thread/makefile.g95 index 859b723d26..b4a920f047 100644 --- a/samples/thread/makefile.g95 +++ b/samples/thread/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for thread example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF) - -all: $(OBJDIR) test$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -test$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/test.$(OBJSUFF): test.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF) +TARGET=test +OBJECTS = $(TARGET).o -$(OBJDIR)/test_resources.o: test.rc - $(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) test$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/toolbar/makefile.g95 b/samples/toolbar/makefile.g95 index a16ac0faec..b4a920f047 100644 --- a/samples/toolbar/makefile.g95 +++ b/samples/toolbar/makefile.g95 @@ -1,40 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for Buttonbar example (UNIX). -# Change the WXDIR directory, and CPPFLAGS and LDFLAGS, for your system. +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -TESTOBJECTS = $(OBJDIR)/test.$(OBJSUFF) $(OBJDIR)/test_resources.$(OBJSUFF) -TESTPROGRAM = test$(GUISUFFIX) - -all: $(OBJDIR) $(TESTPROGRAM) - -demo: $(TESTPROGRAM) - -$(OBJDIR): - mkdir $(OBJDIR) - -$(OBJDIR)/test.$(OBJSUFF): test.h test.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF) - -$(TESTPROGRAM): $(TESTOBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o test$(GUISUFFIX)$(EXESUFF) $(TESTOBJECTS) $(LDLIBS) - -$(OBJDIR)/test_resources.o: test.rc - $(RESCOMP) -i test.rc -o $(OBJDIR)/test_resources.o $(RESFLAGS) +TARGET=test +OBJECTS = $(TARGET).o -clean: - rm -f $(OBJECTS) test$(GUISUFFIX).exe $(TESTOBJECTS) core *.res *.rsc +include $(WXDIR)/src/makeprog.g95 diff --git a/samples/treectrl/makefile.g95 b/samples/treectrl/makefile.g95 index a4123a8ad4..b6e6ff10af 100644 --- a/samples/treectrl/makefile.g95 +++ b/samples/treectrl/makefile.g95 @@ -1,38 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for treetest example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/treetest.$(OBJSUFF) $(OBJDIR)/treetest_resources.$(OBJSUFF) - -all: $(OBJDIR) treetest$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -treetest$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o treetest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/treetest.$(OBJSUFF): treetest.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ treetest.$(SRCSUFF) - -$(OBJDIR)/treetest_resources.o: treetest.rc - $(RESCOMP) -i treetest.rc -o $(OBJDIR)/treetest_resources.o $(RESFLAGS) +TARGET=treetest +OBJECTS = $(TARGET).o +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) treetest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/typetest/makefile.g95 b/samples/typetest/makefile.g95 index 692a5095ad..9d067c2c70 100644 --- a/samples/typetest/makefile.g95 +++ b/samples/typetest/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for typetest example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/typetest.$(OBJSUFF) $(OBJDIR)/typetest_resources.$(OBJSUFF) - -all: $(OBJDIR) typetest$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -typetest$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o typetest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/typetest.$(OBJSUFF): typetest.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ typetest.$(SRCSUFF) +TARGET=typetest +OBJECTS = $(TARGET).o -$(OBJDIR)/typetest_resources.o: typetest.rc - $(RESCOMP) -i typetest.rc -o $(OBJDIR)/typetest_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) typetest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/validate/makefile.g95 b/samples/validate/makefile.g95 index eba871379b..593057f6eb 100644 --- a/samples/validate/makefile.g95 +++ b/samples/validate/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for validate example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/validate.$(OBJSUFF) $(OBJDIR)/validate_resources.$(OBJSUFF) - -all: $(OBJDIR) validate$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -validate$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o validate$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/validate.$(OBJSUFF): validate.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ validate.$(SRCSUFF) +TARGET=validate +OBJECTS = $(TARGET).o -$(OBJDIR)/validate_resources.o: validate.rc - $(RESCOMP) -i validate.rc -o $(OBJDIR)/validate_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) validate$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/wxpoem/makefile.g95 b/samples/wxpoem/makefile.g95 index 7a408acde4..45cd3e4dba 100644 --- a/samples/wxpoem/makefile.g95 +++ b/samples/wxpoem/makefile.g95 @@ -1,37 +1,16 @@ # -# File: makefile.unx -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: (c) 1993, AIAI, University of Edinburgh +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 # -# "%W% %G%" -# -# Makefile for wxpoem example (UNIX). +# Makefile for wxWindows sample (Cygwin/Mingw32). WXDIR = ../.. -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -OBJECTS = $(OBJDIR)/wxpoem.$(OBJSUFF) $(OBJDIR)/wxpoem_resources.$(OBJSUFF) - -all: $(OBJDIR) wxpoem$(GUISUFFIX)$(EXESUFF) - -wx: - -$(OBJDIR): - mkdir $(OBJDIR) - -wxpoem$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) - $(CC) $(LDFLAGS) -o wxpoem$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) - -$(OBJDIR)/wxpoem.$(OBJSUFF): wxpoem.$(SRCSUFF) - $(CC) -c $(CPPFLAGS) -o $@ wxpoem.$(SRCSUFF) +TARGET=wxpoem +OBJECTS = $(TARGET).o -$(OBJDIR)/wxpoem_resources.o: wxpoem.rc - $(RESCOMP) -i wxpoem.rc -o $(OBJDIR)/wxpoem_resources.o $(RESFLAGS) +include $(WXDIR)/src/makeprog.g95 -clean: - rm -f $(OBJECTS) wxpoem$(GUISUFFIX).exe core *.rsc *.res -- 2.45.2