From 8fef0a6eaea2cf6e4cbd3a833f07f253ef2ab403 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Tue, 14 Mar 2000 18:58:22 +0000 Subject: [PATCH] renamed tab sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/tab/Makefile.in | 13 +++++++++++ samples/tab/makefile.b32 | 12 +++------- samples/tab/makefile.bcc | 11 +++------ samples/tab/makefile.dos | 15 ++++--------- samples/tab/makefile.g95 | 14 ++++-------- samples/tab/makefile.sc | 37 +++++++++++++++++++++++++++++++ samples/tab/makefile.sl | 14 ++++++++++++ samples/tab/makefile.twn | 35 +++++++++++++++++++++++++++++ samples/tab/makefile.unx | 32 +++++++++++++++----------- samples/tab/makefile.vc | 13 +++-------- samples/tab/makefile.wat | 10 +++------ samples/tab/{test.cpp => tab.cpp} | 4 ++-- samples/tab/{test.def => tab.def} | 2 +- samples/tab/{test.h => tab.h} | 2 +- samples/tab/{test.rc => tab.rc} | 0 15 files changed, 142 insertions(+), 72 deletions(-) create mode 100644 samples/tab/Makefile.in create mode 100644 samples/tab/makefile.sc create mode 100644 samples/tab/makefile.sl create mode 100644 samples/tab/makefile.twn rename samples/tab/{test.cpp => tab.cpp} (99%) rename samples/tab/{test.def => tab.def} (91%) rename samples/tab/{test.h => tab.h} (98%) rename samples/tab/{test.rc => tab.rc} (100%) diff --git a/samples/tab/Makefile.in b/samples/tab/Makefile.in new file mode 100644 index 0000000000..26b17cdaae --- /dev/null +++ b/samples/tab/Makefile.in @@ -0,0 +1,13 @@ +# Purpose: makefile for tab example (UNIX). +# Created: 2000-03-15 + +top_srcdir = @top_srcdir@/.. +top_builddir = ../.. +program_dir = samples/tab + +PROGRAM=tab + +OBJECTS=$(PROGRAM).o + +include ../../src/makeprog.env + diff --git a/samples/tab/makefile.b32 b/samples/tab/makefile.b32 index 95ddc80d76..b47c6f67b7 100644 --- a/samples/tab/makefile.b32 +++ b/samples/tab/makefile.b32 @@ -1,15 +1,9 @@ -# -# File: makefile.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Makefile : Builds sample for 32-bit BC++ +# Purpose: makefile for tab example (BC++ 32bit) +# Created: 2000-03-15 WXDIR = $(WXWIN) -TARGET=test +TARGET=tab OBJECTS = $(TARGET).obj !include $(WXDIR)\src\makeprog.b32 diff --git a/samples/tab/makefile.bcc b/samples/tab/makefile.bcc index 669f01905a..3692ea19d2 100644 --- a/samples/tab/makefile.bcc +++ b/samples/tab/makefile.bcc @@ -1,10 +1,5 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# Purpose: makefile for tab example (BC++ 16bit) +# Created: 2000-03-15 !if "$(WXWIN)" == "" !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx @@ -12,7 +7,7 @@ WXDIR = $(WXWIN) -TARGET=test +TARGET=tab OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.bcc diff --git a/samples/tab/makefile.dos b/samples/tab/makefile.dos index 13e3a4ce8e..4953032190 100644 --- a/samples/tab/makefile.dos +++ b/samples/tab/makefile.dos @@ -1,17 +1,10 @@ -# -# File: makefile.dos -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Makefile : Builds 16-bit sample, VC++ 1.5 -# Use FINAL=1 argument to nmake to build final version with no debugging -# info +# Purpose: makefile for tab example (VC++ 1.5x) +# Created: 2000-03-15 WXDIR = $(WXWIN) -TARGET=test -OBJECTS = $(TARGET).obj +TARGET=tab +OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.msc diff --git a/samples/tab/makefile.g95 b/samples/tab/makefile.g95 index b4a920f047..22604cb9ca 100644 --- a/samples/tab/makefile.g95 +++ b/samples/tab/makefile.g95 @@ -1,16 +1,10 @@ -# -# File: makefile.g95 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: (c) Julian Smart, 1999 -# -# Makefile for wxWindows sample (Cygwin/Mingw32). +# Purpose: makefile for tab example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. -TARGET=test +TARGET=tab OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/tab/makefile.sc b/samples/tab/makefile.sc new file mode 100644 index 0000000000..1c9f969d47 --- /dev/null +++ b/samples/tab/makefile.sc @@ -0,0 +1,37 @@ +# Purpose: makefile for tab example (Symantec C++) +# Created: 2000-03-15 + +WXDIR = $(WXWIN) +WXLIB = $(WXDIR)\lib\wx.lib +INCDIR = $(WXDIR)\include +INCLUDE=$(INCDIR) +TARGET=tab + +include $(WXDIR)\src\makesc.env + +tab.exe: tab.obj $(DEFFILE) tab.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k tab.res + +sc32.def: + echo EXETYPE NT > sc32.def + echo SUBSYSTEM WINDOWS >> sc32.def + +sc16.def: + echo NAME $(TARGET) > sc16.def + echo EXETYPE WINDOWS >> sc16.def + echo STUB 'WINSTUB.EXE' >> sc16.def + echo CODE PRELOAD MOVEABLE DISCARDABLE >> sc16.def + echo DATA PRELOAD MOVEABLE MULTIPLE >> sc16.def + echo HEAPSIZE 1024 >> sc16.def + echo STACKSIZE 8192 >> sc16.def + +clean: + -del *.obj + -del *.exe + -del *.res + -del *.map + -del *.rws + -del sc32.def + -del sc16.def + diff --git a/samples/tab/makefile.sl b/samples/tab/makefile.sl new file mode 100644 index 0000000000..b895a0ef3f --- /dev/null +++ b/samples/tab/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for tab example (Salford C++) +# Created: 2000-03-15 + +PROGRAM = tab +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\tab + diff --git a/samples/tab/makefile.twn b/samples/tab/makefile.twn new file mode 100644 index 0000000000..8edbc91c1b --- /dev/null +++ b/samples/tab/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for tab example (TWIN) +# Created: 2000-03-15 + +WXDIR = ../.. + +# All common UNIX compiler flags and options are now in +# this central makefile. +include $(WXDIR)/src/maketwin.env + +OBJECTS = $(OBJDIR)/tab.$(OBJSUFF) $(OBJDIR)/tab.$(OBJSUFF) + +all: $(OBJDIR) tab$(GUISUFFIX)$(EXESUFF) + +wx: + +$(OBJDIR): + mkdir $(OBJDIR) + +tab$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o tab$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) + +$(OBJDIR)/tab.$(OBJSUFF): tab.$(SRCSUFF) + $(CC) -c $(CPPFLAGS) -o $@ tab.$(SRCSUFF) + +tab.c: tab.rc + $(RESCOMP) $(RCINPUTSWITCH) tab.rc $(RCOUTPUTSWITCH) tab.c $(RESFLAGS) + +$(OBJDIR)/tab.$(OBJSUFF): tab.c + $(CC) -c $(CPPFLAGS) -o $@ tab.c + +#$(OBJDIR)/tab.o: tab.rc +# $(RESCOMP) $(RCINPUTSWITCH) tab.rc $(RCOUTPUTSWITCH) $(OBJDIR)/tab.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) tab$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/tab/makefile.unx b/samples/tab/makefile.unx index 1c66f71f22..c496a336b3 100644 --- a/samples/tab/makefile.unx +++ b/samples/tab/makefile.unx @@ -1,17 +1,23 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for tab example (UNIX). +# Purpose: makefile for tab example (Unix) +# Created: 2000-03-15 -PROGRAM=test +CC = gcc -OBJECTS=$(PROGRAM).o +PROGRAM = tab -include ../../src/makeprog.env +OBJECTS = $(PROGRAM).o +# implementation + +.SUFFIXES: .o .cpp + +.cpp.o : + $(CC) -c `wx-config --cflags` -o $@ $< + +all: $(PROGRAM) + +$(PROGRAM): $(OBJECTS) + $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` + +clean: + rm -f *.o $(PROGRAM) diff --git a/samples/tab/makefile.vc b/samples/tab/makefile.vc index 4ada748eda..4e105a04c0 100644 --- a/samples/tab/makefile.vc +++ b/samples/tab/makefile.vc @@ -1,17 +1,10 @@ -# -# File: makefile.vc -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: (c) Julian Smart -# -# Makefile : Builds sample (VC++, WIN32) -# Use FINAL=1 argument to nmake to build final version with no debug info. +# Purpose: makefile for tab example (VC++ 32bit) +# Created: 2000-03-15 # Set WXDIR for your system WXDIR = $(WXWIN) -PROGRAM=test +PROGRAM=tab OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.vc diff --git a/samples/tab/makefile.wat b/samples/tab/makefile.wat index 81a83e42a9..cab5746fd5 100644 --- a/samples/tab/makefile.wat +++ b/samples/tab/makefile.wat @@ -1,13 +1,9 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# Purpose: makefile for tab example (Watcom) +# Created: 2000-03-15 WXDIR = $(%WXWIN) -PROGRAM = test +PROGRAM = tab OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat diff --git a/samples/tab/test.cpp b/samples/tab/tab.cpp similarity index 99% rename from samples/tab/test.cpp rename to samples/tab/tab.cpp index 1c2f6fd553..13d24ec506 100644 --- a/samples/tab/test.cpp +++ b/samples/tab/tab.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: test.cpp +// Name: tab.cpp // Purpose: Tab demo // Author: Julian Smart // Modified by: @@ -21,7 +21,7 @@ #endif #include "wx/tab.h" -#include "test.h" +#include "tab.h" // If 1, use a dialog. Otherwise use a frame. #define USE_TABBED_DIALOG 1 diff --git a/samples/tab/test.def b/samples/tab/tab.def similarity index 91% rename from samples/tab/test.def rename to samples/tab/tab.def index bacb3d4dda..8bd33c1063 100644 --- a/samples/tab/test.def +++ b/samples/tab/tab.def @@ -1,4 +1,4 @@ -NAME Test +NAME Tab DESCRIPTION 'Tab test' EXETYPE WINDOWS STUB 'WINSTUB.EXE' diff --git a/samples/tab/test.h b/samples/tab/tab.h similarity index 98% rename from samples/tab/test.h rename to samples/tab/tab.h index adb13a16fc..0763ffe8b4 100644 --- a/samples/tab/test.h +++ b/samples/tab/tab.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: test.h +// Name: tab.h // Purpose: Tab demo // Author: Julian Smart // Modified by: diff --git a/samples/tab/test.rc b/samples/tab/tab.rc similarity index 100% rename from samples/tab/test.rc rename to samples/tab/tab.rc -- 2.47.2