From f30dcba95deab69e102f4fccb30168539f4cbdfd Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Tue, 14 Mar 2000 19:09:12 +0000 Subject: [PATCH] renamed grid sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/grid/Makefile.in | 16 +++---------- samples/grid/{test.cpp => grid.cpp} | 2 +- samples/grid/{test.def => grid.def} | 2 +- samples/grid/{test.rc => grid.rc} | 0 samples/grid/makefile.b32 | 12 +++------- samples/grid/makefile.bcc | 11 +++------ samples/grid/makefile.dos | 15 ++++-------- samples/grid/makefile.g95 | 14 ++++------- samples/grid/makefile.sc | 37 +++++++++++++++++++++++++++++ samples/grid/makefile.sl | 14 +++++++++++ samples/grid/makefile.twn | 35 +++++++++++++++++++++++++++ samples/grid/makefile.unx | 20 ++++------------ samples/grid/makefile.vc | 13 +++------- samples/grid/makefile.wat | 10 +++----- 14 files changed, 115 insertions(+), 86 deletions(-) rename samples/grid/{test.cpp => grid.cpp} (99%) rename samples/grid/{test.def => grid.def} (91%) rename samples/grid/{test.rc => grid.rc} (100%) create mode 100644 samples/grid/makefile.sc create mode 100644 samples/grid/makefile.sl create mode 100644 samples/grid/makefile.twn diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 5fb458727a..756d62e454 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -1,13 +1,5 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for toolbar example (UNIX). +# Purpose: makefile for grid example (UNIX). +# Created: 2000-03-15 top_srcdir = @top_srcdir@/.. top_builddir = ../.. @@ -15,9 +7,7 @@ program_dir = samples/grid PROGRAM=grid -OBJECTS=test.o - +OBJECTS=$(PROGRAM).o include ../../src/makeprog.env - diff --git a/samples/grid/test.cpp b/samples/grid/grid.cpp similarity index 99% rename from samples/grid/test.cpp rename to samples/grid/grid.cpp index 743ba4f79f..ed7ad8001a 100644 --- a/samples/grid/test.cpp +++ b/samples/grid/grid.cpp @@ -1,5 +1,5 @@ /* - * File: test.cpp + * File: grid.cpp * Purpose: wxGrid test * Author: Julian Smart * Created: 1995 diff --git a/samples/grid/test.def b/samples/grid/grid.def similarity index 91% rename from samples/grid/test.def rename to samples/grid/grid.def index 3dd3b7a033..3ff4e2c552 100644 --- a/samples/grid/test.def +++ b/samples/grid/grid.def @@ -1,4 +1,4 @@ -NAME Test +NAME Grid DESCRIPTION 'wxTableWindow Test' EXETYPE WINDOWS STUB 'WINSTUB.EXE' diff --git a/samples/grid/test.rc b/samples/grid/grid.rc similarity index 100% rename from samples/grid/test.rc rename to samples/grid/grid.rc diff --git a/samples/grid/makefile.b32 b/samples/grid/makefile.b32 index 95ddc80d76..05eecd7959 100644 --- a/samples/grid/makefile.b32 +++ b/samples/grid/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 grid example (BC++ 32bit) +# Created: 2000-03-15 WXDIR = $(WXWIN) -TARGET=test +TARGET=grid OBJECTS = $(TARGET).obj !include $(WXDIR)\src\makeprog.b32 diff --git a/samples/grid/makefile.bcc b/samples/grid/makefile.bcc index 669f01905a..37c91fe0af 100644 --- a/samples/grid/makefile.bcc +++ b/samples/grid/makefile.bcc @@ -1,10 +1,5 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# Purpose: makefile for grid 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=grid OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.bcc diff --git a/samples/grid/makefile.dos b/samples/grid/makefile.dos index 13e3a4ce8e..6ebe4f8a5e 100644 --- a/samples/grid/makefile.dos +++ b/samples/grid/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 grid example (VC++ 1.5x) +# Created: 2000-03-15 WXDIR = $(WXWIN) -TARGET=test -OBJECTS = $(TARGET).obj +TARGET=grid +OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.msc diff --git a/samples/grid/makefile.g95 b/samples/grid/makefile.g95 index b4a920f047..ae8121341f 100644 --- a/samples/grid/makefile.g95 +++ b/samples/grid/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 grid example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. -TARGET=test +TARGET=grid OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/grid/makefile.sc b/samples/grid/makefile.sc new file mode 100644 index 0000000000..200240cfc9 --- /dev/null +++ b/samples/grid/makefile.sc @@ -0,0 +1,37 @@ +# Purpose: makefile for grid example (Symantec C++) +# Created: 2000-03-15 + +WXDIR = $(WXWIN) +WXLIB = $(WXDIR)\lib\wx.lib +INCDIR = $(WXDIR)\include +INCLUDE=$(INCDIR) +TARGET=grid + +include $(WXDIR)\src\makesc.env + +grid.exe: grid.obj $(DEFFILE) grid.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k grid.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/grid/makefile.sl b/samples/grid/makefile.sl new file mode 100644 index 0000000000..d525163635 --- /dev/null +++ b/samples/grid/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for grid example (Salford C++) +# Created: 2000-03-15 + +PROGRAM = grid +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\grid + diff --git a/samples/grid/makefile.twn b/samples/grid/makefile.twn new file mode 100644 index 0000000000..6ceef03622 --- /dev/null +++ b/samples/grid/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for grid 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)/grid.$(OBJSUFF) $(OBJDIR)/grid.$(OBJSUFF) + +all: $(OBJDIR) grid$(GUISUFFIX)$(EXESUFF) + +wx: + +$(OBJDIR): + mkdir $(OBJDIR) + +grid$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o grid$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) + +$(OBJDIR)/grid.$(OBJSUFF): grid.$(SRCSUFF) + $(CC) -c $(CPPFLAGS) -o $@ grid.$(SRCSUFF) + +grid.c: grid.rc + $(RESCOMP) $(RCINPUTSWITCH) grid.rc $(RCOUTPUTSWITCH) grid.c $(RESFLAGS) + +$(OBJDIR)/grid.$(OBJSUFF): grid.c + $(CC) -c $(CPPFLAGS) -o $@ grid.c + +#$(OBJDIR)/grid.o: grid.rc +# $(RESCOMP) $(RCINPUTSWITCH) grid.rc $(RCOUTPUTSWITCH) $(OBJDIR)/grid.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) grid$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/grid/makefile.unx b/samples/grid/makefile.unx index 21cab3c677..a80a6ec93e 100644 --- a/samples/grid/makefile.unx +++ b/samples/grid/makefile.unx @@ -1,21 +1,9 @@ -# -# File: Makefile for samples -# Author: Robert Roebling -# Created: 1999 -# Updated: -# Copyright: (c) 1998 Robert Roebling -# -# This makefile requires a Unix version of wxWindows -# to be installed on your system. This is most often -# done typing "make install" when using the complete -# sources of wxWindows or by installing the two -# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm -# under Linux. -# +# Purpose: makefile for grid example (Unix) +# Created: 2000-03-15 CC = gcc -PROGRAM = test +PROGRAM = grid OBJECTS = $(PROGRAM).o @@ -31,5 +19,5 @@ all: $(PROGRAM) $(PROGRAM): $(OBJECTS) $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -clean: +clean: rm -f *.o $(PROGRAM) diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc index 4ada748eda..3c88d2b859 100644 --- a/samples/grid/makefile.vc +++ b/samples/grid/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 grid example (VC++ 32bit) +# Created: 2000-03-15 # Set WXDIR for your system WXDIR = $(WXWIN) -PROGRAM=test +PROGRAM=grid OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.vc diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat index 81a83e42a9..9d71a42089 100644 --- a/samples/grid/makefile.wat +++ b/samples/grid/makefile.wat @@ -1,13 +1,9 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# Purpose: makefile for grid example (Watcom) +# Created: 2000-03-15 WXDIR = $(%WXWIN) -PROGRAM = test +PROGRAM = grid OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.wat -- 2.50.0