From: Ron Lee Date: Tue, 14 Mar 2000 14:06:41 +0000 (+0000) Subject: updated samples makefiles X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/367e57ec9b921d7523c1ac3e9e3477850aaf3c66 updated samples makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 28da4b485f..a5dbfee067 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -1,13 +1,5 @@ -# -# File: Makefile.in -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for checklst example (UNIX). +# Purpose: makefile for exec example (UNIX). +# Created: 2000-03-14 top_srcdir = @top_srcdir@/.. top_builddir = ../.. diff --git a/samples/exec/makefile.b32 b/samples/exec/makefile.b32 index 7fe8642b41..85c97f0f15 100644 --- a/samples/exec/makefile.b32 +++ b/samples/exec/makefile.b32 @@ -1,11 +1,5 @@ -# -# File: makefile.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Makefile : Builds sample for 32-bit BC++ +# Purpose: makefile for exec example (BC++ 32bit) +# Created: 2000-03-14 WXDIR = $(WXWIN) diff --git a/samples/exec/makefile.bcc b/samples/exec/makefile.bcc index 61cb92fb55..01928afc62 100644 --- a/samples/exec/makefile.bcc +++ b/samples/exec/makefile.bcc @@ -1,10 +1,5 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# Purpose: makefile for exec example (BC++ 16bit) +# Created: 2000-03-14 !if "$(WXWIN)" == "" !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx diff --git a/samples/exec/makefile.dos b/samples/exec/makefile.dos index 9ade46c750..9c8fcbf3c6 100644 --- a/samples/exec/makefile.dos +++ b/samples/exec/makefile.dos @@ -1,12 +1,5 @@ -# -# 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 exec example (VC++ 1.5x) +# Created: 2000-03-14 WXDIR = $(WXWIN) diff --git a/samples/exec/makefile.g95 b/samples/exec/makefile.g95 index 6fca67dc2b..6292100f68 100644 --- a/samples/exec/makefile.g95 +++ b/samples/exec/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 exec example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. TARGET=exec OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/exec/makefile.sc b/samples/exec/makefile.sc new file mode 100644 index 0000000000..e1a3a1a4f6 --- /dev/null +++ b/samples/exec/makefile.sc @@ -0,0 +1,37 @@ +# Purpose: makefile for exec example (Symantec C++) +# Created: 2000-03-14 + +WXDIR = $(WXWIN) +WXLIB = $(WXDIR)\lib\wx.lib +INCDIR = $(WXDIR)\include +INCLUDE=$(INCDIR) +TARGET=exec + +include $(WXDIR)\src\makesc.env + +exec.exe: exec.obj $(DEFFILE) exec.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k exec.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/exec/makefile.sl b/samples/exec/makefile.sl new file mode 100644 index 0000000000..9bdc37a898 --- /dev/null +++ b/samples/exec/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for exec example (Salford C++) +# Created: 2000-03-14 + +PROGRAM = exec +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\exec + diff --git a/samples/exec/makefile.twn b/samples/exec/makefile.twn new file mode 100644 index 0000000000..b83cb49c73 --- /dev/null +++ b/samples/exec/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for exec example (TWIN) +# Created: 2000-03-14 + +WXDIR = ../.. + +# All common UNIX compiler flags and options are now in +# this central makefile. +include $(WXDIR)/src/maketwin.env + +OBJECTS = $(OBJDIR)/exec.$(OBJSUFF) $(OBJDIR)/exec.$(OBJSUFF) + +all: $(OBJDIR) exec$(GUISUFFIX)$(EXESUFF) + +wx: + +$(OBJDIR): + mkdir $(OBJDIR) + +exec$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o exec$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) + +$(OBJDIR)/exec.$(OBJSUFF): exec.$(SRCSUFF) + $(CC) -c $(CPPFLAGS) -o $@ exec.$(SRCSUFF) + +exec.c: exec.rc + $(RESCOMP) $(RCINPUTSWITCH) exec.rc $(RCOUTPUTSWITCH) exec.c $(RESFLAGS) + +$(OBJDIR)/exec.$(OBJSUFF): exec.c + $(CC) -c $(CPPFLAGS) -o $@ exec.c + +#$(OBJDIR)/exec.o: exec.rc +# $(RESCOMP) $(RCINPUTSWITCH) exec.rc $(RCOUTPUTSWITCH) $(OBJDIR)/exec.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) exec$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx new file mode 100644 index 0000000000..55d59a74d0 --- /dev/null +++ b/samples/exec/makefile.unx @@ -0,0 +1,23 @@ +# Purpose: makefile for exec example (Unix) +# Created: 2000-03-14 + +CC = gcc + +PROGRAM = exec + +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/exec/makefile.vc b/samples/exec/makefile.vc index 2781f416ae..a3b548c5c6 100644 --- a/samples/exec/makefile.vc +++ b/samples/exec/makefile.vc @@ -1,12 +1,5 @@ -# -# 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 exec example (VC++ 32bit) +# Created: 2000-03-14 # Set WXDIR for your system WXDIR = $(WXWIN) diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat index ff5c8e0457..b81df8d74b 100644 --- a/samples/exec/makefile.wat +++ b/samples/exec/makefile.wat @@ -1,9 +1,5 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# Purpose: makefile for exec example (Watcom) +# Created: 2000-03-14 WXDIR = $(%WXWIN) diff --git a/samples/ipc/makefile.unx b/samples/ipc/makefile.unx new file mode 100644 index 0000000000..594658ab9c --- /dev/null +++ b/samples/ipc/makefile.unx @@ -0,0 +1,25 @@ +# Purpose: makefile for ipc example (Unix) +# Created: 2000-03-14 +# hand hacked from template file by Ron + +CC = gcc + +PROGRAMS = client server + +# implementation + +.SUFFIXES: .o .cpp + +.cpp.o : + $(CC) -c `wx-config --cflags` -o $@ $< + +all: $(PROGRAMS) + +client: client.o + $(CC) -o $@ $< `wx-config --libs` + +server: server.o + $(CC) -o $@ $< `wx-config --libs` + +clean: + rm -f *.o $(PROGRAMS) diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp index 2709bc19ff..900fe3b686 100644 --- a/samples/joytest/joytest.cpp +++ b/samples/joytest/joytest.cpp @@ -20,8 +20,8 @@ #include "wx/wx.h" #endif -#include -#include +#include +#include #include "joytest.h" diff --git a/samples/joytest/makefile.b32 b/samples/joytest/makefile.b32 index 1ab531405a..0b592c8042 100644 --- a/samples/joytest/makefile.b32 +++ b/samples/joytest/makefile.b32 @@ -1,11 +1,5 @@ -# -# File: makefile.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Makefile : Builds sample for 32-bit BC++ +# Purpose: makefile for joytest example (BC++ 32bit) +# Created: 2000-03-14 WXDIR = $(WXWIN) diff --git a/samples/joytest/makefile.bcc b/samples/joytest/makefile.bcc index d84ed49281..51ff8dfd69 100644 --- a/samples/joytest/makefile.bcc +++ b/samples/joytest/makefile.bcc @@ -1,10 +1,5 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# Purpose: makefile for joytest example (BC++ 16bit) +# Created: 2000-03-14 !if "$(WXWIN)" == "" !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx diff --git a/samples/joytest/makefile.dos b/samples/joytest/makefile.dos index df94746c2e..ea15c62cce 100644 --- a/samples/joytest/makefile.dos +++ b/samples/joytest/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 joytest example (VC++ 1.5x) +# Created: 2000-03-14 WXDIR = $(WXWIN) TARGET=joytest -OBJECTS = $(TARGET).obj +OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.msc diff --git a/samples/joytest/makefile.g95 b/samples/joytest/makefile.g95 index 565c1a9bfb..67132e46c5 100644 --- a/samples/joytest/makefile.g95 +++ b/samples/joytest/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 joytest example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. TARGET=joytest OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/joytest/makefile.sc b/samples/joytest/makefile.sc index bcdcb11d54..be3c6ffd92 100644 --- a/samples/joytest/makefile.sc +++ b/samples/joytest/makefile.sc @@ -1,37 +1,37 @@ -; Last change: JS 12 Apr 98 10:45 am -# Symantec C++ makefile for joytest example -# NOTE that peripheral libraries are now dealt in main wxWindows makefile. +# Purpose: makefile for joytest example (Symantec C++) +# Created: 2000-03-14 WXDIR = $(WXWIN) -!include $(WXDIR)\src\makesc.env - WXLIB = $(WXDIR)\lib\wx.lib INCDIR = $(WXDIR)\include -MSWINC = $(INCDIR)\msw -BASEINC = $(INCDIR)\base - -CC=sc -RC=rc -CFLAGS = -o -ml -W -Dwx_msw -LDFLAGS = -ml -W +INCLUDE=$(INCDIR) +TARGET=joytest -INCLUDE=$(BASEINC);$(MSWINC) +include $(WXDIR)\src\makesc.env -LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib +joytest.exe: joytest.obj $(DEFFILE) joytest.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k joytest.res -.$(SRCSUFF).obj: - *$(CC) -c $(CFLAGS) -I$(INCLUDE) $< +sc32.def: + echo EXETYPE NT > sc32.def + echo SUBSYSTEM WINDOWS >> sc32.def -.rc.res: - *$(RC) -r -I$(INCLUDE) $< - -joytest.exe: joytest.obj joytest.def joytest.res - *$(CC) $(LDFLAGS) -o$@ joytest.obj joytest.def $(LIBS) - *$(RC) -k joytest.res +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 *.obj -del *.exe -del *.res -del *.map -del *.rws + -del sc32.def + -del sc16.def + diff --git a/samples/joytest/makefile.sl b/samples/joytest/makefile.sl new file mode 100644 index 0000000000..8a8e642ade --- /dev/null +++ b/samples/joytest/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for joytest example (Salford C++) +# Created: 2000-03-14 + +PROGRAM = joytest +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\joytest + diff --git a/samples/joytest/makefile.twn b/samples/joytest/makefile.twn new file mode 100644 index 0000000000..fcd9ea07ef --- /dev/null +++ b/samples/joytest/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for joytest example (TWIN) +# Created: 2000-03-14 + +WXDIR = ../.. + +# All common UNIX compiler flags and options are now in +# this central makefile. +include $(WXDIR)/src/maketwin.env + +OBJECTS = $(OBJDIR)/joytest.$(OBJSUFF) $(OBJDIR)/joytest.$(OBJSUFF) + +all: $(OBJDIR) joytest$(GUISUFFIX)$(EXESUFF) + +wx: + +$(OBJDIR): + mkdir $(OBJDIR) + +joytest$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o joytest$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) + +$(OBJDIR)/joytest.$(OBJSUFF): joytest.$(SRCSUFF) + $(CC) -c $(CPPFLAGS) -o $@ joytest.$(SRCSUFF) + +joytest.c: joytest.rc + $(RESCOMP) $(RCINPUTSWITCH) joytest.rc $(RCOUTPUTSWITCH) joytest.c $(RESFLAGS) + +$(OBJDIR)/joytest.$(OBJSUFF): joytest.c + $(CC) -c $(CPPFLAGS) -o $@ joytest.c + +#$(OBJDIR)/joytest.o: joytest.rc +# $(RESCOMP) $(RCINPUTSWITCH) joytest.rc $(RCOUTPUTSWITCH) $(OBJDIR)/joytest.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) joytest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/joytest/makefile.unx b/samples/joytest/makefile.unx index 7b60c08bea..1f0d1027d3 100644 --- a/samples/joytest/makefile.unx +++ b/samples/joytest/makefile.unx @@ -1,17 +1,23 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for joytest example (UNIX). +# Purpose: makefile for joytest example (Unix) +# Created: 2000-03-14 -PROGRAM=joytest +CC = gcc -OBJECTS=$(PROGRAM).o +PROGRAM = joytest -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/joytest/makefile.vc b/samples/joytest/makefile.vc index a4ef6737c2..94f3d1e489 100644 --- a/samples/joytest/makefile.vc +++ b/samples/joytest/makefile.vc @@ -1,12 +1,5 @@ -# -# 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 joytest example (VC++ 32bit) +# Created: 2000-03-14 # Set WXDIR for your system WXDIR = $(WXWIN) diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat index 57467717d1..8d1fd19ea3 100644 --- a/samples/joytest/makefile.wat +++ b/samples/joytest/makefile.wat @@ -1,9 +1,5 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# Purpose: makefile for joytest example (Watcom) +# Created: 2000-03-14 WXDIR = $(%WXWIN) diff --git a/samples/nativdlg/makefile.unx b/samples/nativdlg/makefile.unx deleted file mode 100644 index 464c4b45d6..0000000000 --- a/samples/nativdlg/makefile.unx +++ /dev/null @@ -1,17 +0,0 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for nativdlg example (UNIX). -# Actually, this is a Windows-specific example... - -PROGRAM=nativdlg - -OBJECTS=$(PROGRAM).o - -include ../../src/makeprog.env diff --git a/samples/propsize/Makefile.in b/samples/propsize/Makefile.in index df53b87bab..93ce47b016 100644 --- a/samples/propsize/Makefile.in +++ b/samples/propsize/Makefile.in @@ -1,13 +1,5 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for wxWindows sample (UNIX). +# Purpose: makefile for propsize example (UNIX). +# Created: 2000-03-14 top_srcdir = @top_srcdir@/.. top_builddir = ../.. @@ -18,3 +10,4 @@ PROGRAM=propsize OBJECTS=$(PROGRAM).o include ../../src/makeprog.env + diff --git a/samples/propsize/makefile.b32 b/samples/propsize/makefile.b32 new file mode 100644 index 0000000000..40e131bcb9 --- /dev/null +++ b/samples/propsize/makefile.b32 @@ -0,0 +1,10 @@ +# Purpose: makefile for propsize example (BC++ 32bit) +# Created: 2000-03-14 + +WXDIR = $(WXWIN) + +TARGET=propsize +OBJECTS = $(TARGET).obj + +!include $(WXDIR)\src\makeprog.b32 + diff --git a/samples/propsize/makefile.bcc b/samples/propsize/makefile.bcc new file mode 100644 index 0000000000..9c53fae8f9 --- /dev/null +++ b/samples/propsize/makefile.bcc @@ -0,0 +1,14 @@ +# Purpose: makefile for propsize example (BC++ 16bit) +# Created: 2000-03-14 + +!if "$(WXWIN)" == "" +!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx +!endif + +WXDIR = $(WXWIN) + +TARGET=propsize +OBJECTS=$(TARGET).obj + +!include $(WXDIR)\src\makeprog.bcc + diff --git a/samples/propsize/makefile.dos b/samples/propsize/makefile.dos new file mode 100644 index 0000000000..f38d18f89f --- /dev/null +++ b/samples/propsize/makefile.dos @@ -0,0 +1,10 @@ +# Purpose: makefile for propsize example (VC++ 1.5x) +# Created: 2000-03-14 + +WXDIR = $(WXWIN) + +TARGET=propsize +OBJECTS=$(TARGET).obj + +!include $(WXDIR)\src\makeprog.msc + diff --git a/samples/propsize/makefile.g95 b/samples/propsize/makefile.g95 index 587135b10d..7c38b8a26a 100644 --- a/samples/propsize/makefile.g95 +++ b/samples/propsize/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 propsize example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. TARGET=propsize OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/propsize/makefile.sc b/samples/propsize/makefile.sc new file mode 100644 index 0000000000..50f7007ba7 --- /dev/null +++ b/samples/propsize/makefile.sc @@ -0,0 +1,37 @@ +# Purpose: makefile for propsize example (Symantec C++) +# Created: 2000-03-14 + +WXDIR = $(WXWIN) +WXLIB = $(WXDIR)\lib\wx.lib +INCDIR = $(WXDIR)\include +INCLUDE=$(INCDIR) +TARGET=propsize + +include $(WXDIR)\src\makesc.env + +propsize.exe: propsize.obj $(DEFFILE) propsize.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k propsize.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/propsize/makefile.sl b/samples/propsize/makefile.sl new file mode 100644 index 0000000000..707fd9ebc1 --- /dev/null +++ b/samples/propsize/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for propsize example (Salford C++) +# Created: 2000-03-14 + +PROGRAM = propsize +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\propsize + diff --git a/samples/propsize/makefile.twn b/samples/propsize/makefile.twn new file mode 100644 index 0000000000..13d6508cdb --- /dev/null +++ b/samples/propsize/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for propsize example (TWIN) +# Created: 2000-03-14 + +WXDIR = ../.. + +# All common UNIX compiler flags and options are now in +# this central makefile. +include $(WXDIR)/src/maketwin.env + +OBJECTS = $(OBJDIR)/propsize.$(OBJSUFF) $(OBJDIR)/propsize.$(OBJSUFF) + +all: $(OBJDIR) propsize$(GUISUFFIX)$(EXESUFF) + +wx: + +$(OBJDIR): + mkdir $(OBJDIR) + +propsize$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o propsize$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) + +$(OBJDIR)/propsize.$(OBJSUFF): propsize.$(SRCSUFF) + $(CC) -c $(CPPFLAGS) -o $@ propsize.$(SRCSUFF) + +propsize.c: propsize.rc + $(RESCOMP) $(RCINPUTSWITCH) propsize.rc $(RCOUTPUTSWITCH) propsize.c $(RESFLAGS) + +$(OBJDIR)/propsize.$(OBJSUFF): propsize.c + $(CC) -c $(CPPFLAGS) -o $@ propsize.c + +#$(OBJDIR)/propsize.o: propsize.rc +# $(RESCOMP) $(RCINPUTSWITCH) propsize.rc $(RCOUTPUTSWITCH) $(OBJDIR)/propsize.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) propsize$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/propsize/makefile.unx b/samples/propsize/makefile.unx new file mode 100644 index 0000000000..df619418fa --- /dev/null +++ b/samples/propsize/makefile.unx @@ -0,0 +1,23 @@ +# Purpose: makefile for propsize example (Unix) +# Created: 2000-03-14 + +CC = gcc + +PROGRAM = propsize + +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/propsize/makefile.vc b/samples/propsize/makefile.vc index c356f69b6f..c9eeb7ec21 100644 --- a/samples/propsize/makefile.vc +++ b/samples/propsize/makefile.vc @@ -1,12 +1,5 @@ -# -# 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 propsize example (VC++ 32bit) +# Created: 2000-03-14 # Set WXDIR for your system WXDIR = $(WXWIN) @@ -15,3 +8,4 @@ PROGRAM=propsize OBJECTS = $(PROGRAM).obj !include $(WXDIR)\src\makeprog.vc + diff --git a/samples/propsize/makefile.wat b/samples/propsize/makefile.wat new file mode 100644 index 0000000000..f2cfc53c1d --- /dev/null +++ b/samples/propsize/makefile.wat @@ -0,0 +1,11 @@ +# Purpose: makefile for propsize example (Watcom) +# Created: 2000-03-14 + +WXDIR = $(%WXWIN) + +PROGRAM = propsize +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.wat + + diff --git a/samples/richedit/makefile.unx b/samples/richedit/makefile.unx new file mode 100644 index 0000000000..bd016fe74a --- /dev/null +++ b/samples/richedit/makefile.unx @@ -0,0 +1,22 @@ +# Purpose: makefile for richedit example (Unix) +# Created: 2000-03-14 +# hand hacked from template file by Ron + +CC = gcc + +PROGRAM = wxLayout + +OBJECTS = $(PROGRAM).o kbList.o wxllist.o wxlparser.o wxlwindow.o + +# implementation + +.SUFFIXES: .o .cpp + +.cpp.o : + $(CC) -c `wx-config --cflags` -o $@ $< + +$(PROGRAM): $(OBJECTS) + $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` + +clean: + rm -f *.o $(PROGRAM) diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in index b7654ce21b..5e2670d751 100644 --- a/samples/sashtest/Makefile.in +++ b/samples/sashtest/Makefile.in @@ -1,13 +1,5 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for sashtest example (UNIX). +# Purpose: makefile for sashtest example (UNIX). +# Created: 2000-03-14 top_srcdir = @top_srcdir@/.. top_builddir = ../.. diff --git a/samples/sashtest/makefile.b32 b/samples/sashtest/makefile.b32 index ce219415a6..45063d5241 100644 --- a/samples/sashtest/makefile.b32 +++ b/samples/sashtest/makefile.b32 @@ -1,11 +1,5 @@ -# -# File: makefile.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Makefile : Builds sample for 32-bit BC++ +# Purpose: makefile for sashtest example (BC++ 32bit) +# Created: 2000-03-14 WXDIR = $(WXWIN) diff --git a/samples/sashtest/makefile.bcc b/samples/sashtest/makefile.bcc index cb03e4dede..102a239d11 100644 --- a/samples/sashtest/makefile.bcc +++ b/samples/sashtest/makefile.bcc @@ -1,10 +1,5 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# Purpose: makefile for sashtest example (BC++ 16bit) +# Created: 2000-03-14 !if "$(WXWIN)" == "" !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx diff --git a/samples/sashtest/makefile.dos b/samples/sashtest/makefile.dos new file mode 100644 index 0000000000..b41a4fe03b --- /dev/null +++ b/samples/sashtest/makefile.dos @@ -0,0 +1,10 @@ +# Purpose: makefile for sashtest example (VC++ 1.5x) +# Created: 2000-03-14 + +WXDIR = $(WXWIN) + +TARGET=sashtest +OBJECTS=$(TARGET).obj + +!include $(WXDIR)\src\makeprog.msc + diff --git a/samples/sashtest/makefile.g95 b/samples/sashtest/makefile.g95 index 868594ea98..9e76f66b10 100644 --- a/samples/sashtest/makefile.g95 +++ b/samples/sashtest/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 sashtest example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. TARGET=sashtest OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/sashtest/makefile.sc b/samples/sashtest/makefile.sc new file mode 100644 index 0000000000..4c48c9e12f --- /dev/null +++ b/samples/sashtest/makefile.sc @@ -0,0 +1,37 @@ +# Purpose: makefile for sashtest example (Symantec C++) +# Created: 2000-03-14 + +WXDIR = $(WXWIN) +WXLIB = $(WXDIR)\lib\wx.lib +INCDIR = $(WXDIR)\include +INCLUDE=$(INCDIR) +TARGET=sashtest + +include $(WXDIR)\src\makesc.env + +sashtest.exe: sashtest.obj $(DEFFILE) sashtest.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k sashtest.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/sashtest/makefile.sl b/samples/sashtest/makefile.sl new file mode 100644 index 0000000000..fa4aff80f0 --- /dev/null +++ b/samples/sashtest/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for sashtest example (Salford C++) +# Created: 2000-03-14 + +PROGRAM = sashtest +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\sashtest + diff --git a/samples/sashtest/makefile.twn b/samples/sashtest/makefile.twn new file mode 100644 index 0000000000..22052344b8 --- /dev/null +++ b/samples/sashtest/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for sashtest example (TWIN) +# Created: 2000-03-14 + +WXDIR = ../.. + +# All common UNIX compiler flags and options are now in +# this central makefile. +include $(WXDIR)/src/maketwin.env + +OBJECTS = $(OBJDIR)/sashtest.$(OBJSUFF) $(OBJDIR)/sashtest.$(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) + +sashtest.c: sashtest.rc + $(RESCOMP) $(RCINPUTSWITCH) sashtest.rc $(RCOUTPUTSWITCH) sashtest.c $(RESFLAGS) + +$(OBJDIR)/sashtest.$(OBJSUFF): sashtest.c + $(CC) -c $(CPPFLAGS) -o $@ sashtest.c + +#$(OBJDIR)/sashtest.o: sashtest.rc +# $(RESCOMP) $(RCINPUTSWITCH) sashtest.rc $(RCOUTPUTSWITCH) $(OBJDIR)/sashtest.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) sashtest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/sashtest/makefile.unx b/samples/sashtest/makefile.unx new file mode 100644 index 0000000000..4145bb6a72 --- /dev/null +++ b/samples/sashtest/makefile.unx @@ -0,0 +1,23 @@ +# Purpose: makefile for sashtest example (Unix) +# Created: 2000-03-14 + +CC = gcc + +PROGRAM = sashtest + +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/sashtest/makefile.vc b/samples/sashtest/makefile.vc index 878493df48..dd4d979156 100644 --- a/samples/sashtest/makefile.vc +++ b/samples/sashtest/makefile.vc @@ -1,12 +1,5 @@ -# -# 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 sashtest example (VC++ 32bit) +# Created: 2000-03-14 # Set WXDIR for your system WXDIR = $(WXWIN) diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat index 8c4081d4a0..ddb80f3233 100644 --- a/samples/sashtest/makefile.wat +++ b/samples/sashtest/makefile.wat @@ -1,9 +1,5 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# Purpose: makefile for sashtest example (Watcom) +# Created: 2000-03-14 WXDIR = $(%WXWIN) diff --git a/samples/sockets/makefile.unx b/samples/sockets/makefile.unx new file mode 100644 index 0000000000..ba32b1fcf8 --- /dev/null +++ b/samples/sockets/makefile.unx @@ -0,0 +1,25 @@ +# Purpose: makefile for sockets example (Unix) +# Created: 2000-03-14 +# hand hacked from template file by Ron + +CC = gcc + +PROGRAMS = client server + +# implementation + +.SUFFIXES: .o .cpp + +.cpp.o : + $(CC) -c `wx-config --cflags` -o $@ $< + +all: $(PROGRAMS) + +client: client.o + $(CC) -o $@ $< `wx-config --libs` + +server: server.o + $(CC) -o $@ $< `wx-config --libs` + +clean: + rm -f *.o $(PROGRAMS) diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in index a558fb6744..b16304b995 100644 --- a/samples/toolbar/Makefile.in +++ b/samples/toolbar/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 toolbar example (UNIX). +# Created: 2000-03-14 top_srcdir = @top_srcdir@/.. top_builddir = ../.. @@ -19,4 +11,3 @@ OBJECTS=$(PROGRAM).o include ../../src/makeprog.env - diff --git a/samples/toolbar/makefile.b32 b/samples/toolbar/makefile.b32 index 1645915c3a..6cefc83007 100644 --- a/samples/toolbar/makefile.b32 +++ b/samples/toolbar/makefile.b32 @@ -1,11 +1,5 @@ -# -# File: makefile.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Makefile : Builds sample for 32-bit BC++ +# Purpose: makefile for toolbar example (BC++ 32bit) +# Created: 2000-03-14 WXDIR = $(WXWIN) diff --git a/samples/toolbar/makefile.bcc b/samples/toolbar/makefile.bcc index 3694771dd1..a622b7c6aa 100644 --- a/samples/toolbar/makefile.bcc +++ b/samples/toolbar/makefile.bcc @@ -1,10 +1,5 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# Purpose: makefile for toolbar example (BC++ 16bit) +# Created: 2000-03-14 !if "$(WXWIN)" == "" !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx diff --git a/samples/toolbar/makefile.dos b/samples/toolbar/makefile.dos index c98a1b1f01..bb6f8d0c48 100644 --- a/samples/toolbar/makefile.dos +++ b/samples/toolbar/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 toolbar example (VC++ 1.5x) +# Created: 2000-03-14 WXDIR = $(WXWIN) TARGET=toolbar -OBJECTS = $(TARGET).obj +OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.msc diff --git a/samples/toolbar/makefile.g95 b/samples/toolbar/makefile.g95 index d011eb9db7..25bcc5b88a 100644 --- a/samples/toolbar/makefile.g95 +++ b/samples/toolbar/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 toolbar example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. TARGET=toolbar OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/toolbar/makefile.sc b/samples/toolbar/makefile.sc new file mode 100644 index 0000000000..6de8e6893c --- /dev/null +++ b/samples/toolbar/makefile.sc @@ -0,0 +1,37 @@ +# Purpose: makefile for toolbar example (Symantec C++) +# Created: 2000-03-14 + +WXDIR = $(WXWIN) +WXLIB = $(WXDIR)\lib\wx.lib +INCDIR = $(WXDIR)\include +INCLUDE=$(INCDIR) +TARGET=toolbar + +include $(WXDIR)\src\makesc.env + +toolbar.exe: toolbar.obj $(DEFFILE) toolbar.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k toolbar.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/toolbar/makefile.sl b/samples/toolbar/makefile.sl new file mode 100644 index 0000000000..216b087cf2 --- /dev/null +++ b/samples/toolbar/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for toolbar example (Salford C++) +# Created: 2000-03-14 + +PROGRAM = toolbar +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\toolbar + diff --git a/samples/toolbar/makefile.twn b/samples/toolbar/makefile.twn new file mode 100644 index 0000000000..fd89e57b4b --- /dev/null +++ b/samples/toolbar/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for toolbar example (TWIN) +# Created: 2000-03-14 + +WXDIR = ../.. + +# All common UNIX compiler flags and options are now in +# this central makefile. +include $(WXDIR)/src/maketwin.env + +OBJECTS = $(OBJDIR)/toolbar.$(OBJSUFF) $(OBJDIR)/toolbar.$(OBJSUFF) + +all: $(OBJDIR) toolbar$(GUISUFFIX)$(EXESUFF) + +wx: + +$(OBJDIR): + mkdir $(OBJDIR) + +toolbar$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o toolbar$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) + +$(OBJDIR)/toolbar.$(OBJSUFF): toolbar.$(SRCSUFF) + $(CC) -c $(CPPFLAGS) -o $@ toolbar.$(SRCSUFF) + +toolbar.c: toolbar.rc + $(RESCOMP) $(RCINPUTSWITCH) toolbar.rc $(RCOUTPUTSWITCH) toolbar.c $(RESFLAGS) + +$(OBJDIR)/toolbar.$(OBJSUFF): toolbar.c + $(CC) -c $(CPPFLAGS) -o $@ toolbar.c + +#$(OBJDIR)/toolbar.o: toolbar.rc +# $(RESCOMP) $(RCINPUTSWITCH) toolbar.rc $(RCOUTPUTSWITCH) $(OBJDIR)/toolbar.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) toolbar$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx new file mode 100644 index 0000000000..91d51a0bd1 --- /dev/null +++ b/samples/toolbar/makefile.unx @@ -0,0 +1,23 @@ +# Purpose: makefile for toolbar example (Unix) +# Created: 2000-03-14 + +CC = gcc + +PROGRAM = toolbar + +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/toolbar/makefile.vc b/samples/toolbar/makefile.vc index bbff798ce4..af02a4b4bd 100644 --- a/samples/toolbar/makefile.vc +++ b/samples/toolbar/makefile.vc @@ -1,12 +1,5 @@ -# -# 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 toolbar example (VC++ 32bit) +# Created: 2000-03-14 # Set WXDIR for your system WXDIR = $(WXWIN) diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat index 8c27bfb8a9..95c26443ed 100644 --- a/samples/toolbar/makefile.wat +++ b/samples/toolbar/makefile.wat @@ -1,9 +1,5 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# Purpose: makefile for toolbar example (Watcom) +# Created: 2000-03-14 WXDIR = $(%WXWIN) diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 1a78e48bd3..fff8979e53 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -1,13 +1,5 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for typetest example (UNIX). +# Purpose: makefile for typetest example (UNIX). +# Created: 2000-03-14 top_srcdir = @top_srcdir@/.. top_builddir = ../.. diff --git a/samples/typetest/makefile.b32 b/samples/typetest/makefile.b32 index 7c366bcdde..65e61b9b48 100644 --- a/samples/typetest/makefile.b32 +++ b/samples/typetest/makefile.b32 @@ -1,11 +1,5 @@ -# -# File: makefile.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Makefile : Builds sample for 32-bit BC++ +# Purpose: makefile for typetest example (BC++ 32bit) +# Created: 2000-03-14 WXDIR = $(WXWIN) diff --git a/samples/typetest/makefile.bcc b/samples/typetest/makefile.bcc index 0d0fee1bbc..6b1bebecff 100644 --- a/samples/typetest/makefile.bcc +++ b/samples/typetest/makefile.bcc @@ -1,10 +1,5 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# Purpose: makefile for typetest example (BC++ 16bit) +# Created: 2000-03-14 !if "$(WXWIN)" == "" !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx diff --git a/samples/typetest/makefile.dos b/samples/typetest/makefile.dos index 837e509b02..90f8cb5003 100644 --- a/samples/typetest/makefile.dos +++ b/samples/typetest/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 typetest example (VC++ 1.5x) +# Created: 2000-03-14 WXDIR = $(WXWIN) TARGET=typetest -OBJECTS = $(TARGET).obj +OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.msc diff --git a/samples/typetest/makefile.g95 b/samples/typetest/makefile.g95 index 9d067c2c70..1fa426f499 100644 --- a/samples/typetest/makefile.g95 +++ b/samples/typetest/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 typetest example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. TARGET=typetest OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/typetest/makefile.sc b/samples/typetest/makefile.sc new file mode 100644 index 0000000000..dea8d1a4f3 --- /dev/null +++ b/samples/typetest/makefile.sc @@ -0,0 +1,37 @@ +# Purpose: makefile for typetest example (Symantec C++) +# Created: 2000-03-14 + +WXDIR = $(WXWIN) +WXLIB = $(WXDIR)\lib\wx.lib +INCDIR = $(WXDIR)\include +INCLUDE=$(INCDIR) +TARGET=typetest + +include $(WXDIR)\src\makesc.env + +typetest.exe: typetest.obj $(DEFFILE) typetest.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k typetest.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/typetest/makefile.sl b/samples/typetest/makefile.sl new file mode 100644 index 0000000000..6d7d6dbdac --- /dev/null +++ b/samples/typetest/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for typetest example (Salford C++) +# Created: 2000-03-14 + +PROGRAM = typetest +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\typetest + diff --git a/samples/typetest/makefile.twn b/samples/typetest/makefile.twn new file mode 100644 index 0000000000..56e0ceb3df --- /dev/null +++ b/samples/typetest/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for typetest example (TWIN) +# Created: 2000-03-14 + +WXDIR = ../.. + +# All common UNIX compiler flags and options are now in +# this central makefile. +include $(WXDIR)/src/maketwin.env + +OBJECTS = $(OBJDIR)/typetest.$(OBJSUFF) $(OBJDIR)/typetest.$(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) + +typetest.c: typetest.rc + $(RESCOMP) $(RCINPUTSWITCH) typetest.rc $(RCOUTPUTSWITCH) typetest.c $(RESFLAGS) + +$(OBJDIR)/typetest.$(OBJSUFF): typetest.c + $(CC) -c $(CPPFLAGS) -o $@ typetest.c + +#$(OBJDIR)/typetest.o: typetest.rc +# $(RESCOMP) $(RCINPUTSWITCH) typetest.rc $(RCOUTPUTSWITCH) $(OBJDIR)/typetest.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) typetest$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/typetest/makefile.unx b/samples/typetest/makefile.unx new file mode 100644 index 0000000000..3ec01bb431 --- /dev/null +++ b/samples/typetest/makefile.unx @@ -0,0 +1,23 @@ +# Purpose: makefile for typetest example (Unix) +# Created: 2000-03-14 + +CC = gcc + +PROGRAM = typetest + +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/typetest/makefile.vc b/samples/typetest/makefile.vc index f6b3d288bc..b6092b7656 100644 --- a/samples/typetest/makefile.vc +++ b/samples/typetest/makefile.vc @@ -1,12 +1,5 @@ -# -# 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 typetest example (VC++ 32bit) +# Created: 2000-03-14 # Set WXDIR for your system WXDIR = $(WXWIN) diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat index a96f825f07..8efc4d6a0c 100644 --- a/samples/typetest/makefile.wat +++ b/samples/typetest/makefile.wat @@ -1,9 +1,5 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# Purpose: makefile for typetest example (Watcom) +# Created: 2000-03-14 WXDIR = $(%WXWIN) diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in index 70e24d07e6..fc7bd3037f 100644 --- a/samples/validate/Makefile.in +++ b/samples/validate/Makefile.in @@ -1,13 +1,5 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for validate example (UNIX). +# Purpose: makefile for validate example (UNIX). +# Created: 2000-03-14 top_srcdir = @top_srcdir@/.. top_builddir = ../.. diff --git a/samples/validate/makefile.b32 b/samples/validate/makefile.b32 index bdad7c2d91..fe625e461a 100644 --- a/samples/validate/makefile.b32 +++ b/samples/validate/makefile.b32 @@ -1,11 +1,5 @@ -# -# File: makefile.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Makefile : Builds sample for 32-bit BC++ +# Purpose: makefile for validate example (BC++ 32bit) +# Created: 2000-03-14 WXDIR = $(WXWIN) diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc index 781d93b453..9d0cbe3770 100644 --- a/samples/validate/makefile.bcc +++ b/samples/validate/makefile.bcc @@ -1,10 +1,5 @@ -# -# File: makefile.bcc -# Author: Julian Smart -# Created: 1998 -# Updated: -# -# Builds a BC++ 16-bit sample +# Purpose: makefile for validate example (BC++ 16bit) +# Created: 2000-03-14 !if "$(WXWIN)" == "" !error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx diff --git a/samples/validate/makefile.dos b/samples/validate/makefile.dos index b8a1ba2104..8aa42c38e7 100644 --- a/samples/validate/makefile.dos +++ b/samples/validate/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 validate example (VC++ 1.5x) +# Created: 2000-03-14 WXDIR = $(WXWIN) TARGET=validate -OBJECTS = $(TARGET).obj +OBJECTS=$(TARGET).obj !include $(WXDIR)\src\makeprog.msc diff --git a/samples/validate/makefile.g95 b/samples/validate/makefile.g95 index 593057f6eb..0b00e7e4f0 100644 --- a/samples/validate/makefile.g95 +++ b/samples/validate/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 validate example (Cygwin/Mingw32) +# Created: #03.01.00 WXDIR = ../.. TARGET=validate OBJECTS = $(TARGET).o -include $(WXDIR)/src/makeprog.g95 +include $(WXDIR)\src\makeprog.g95 diff --git a/samples/validate/makefile.sc b/samples/validate/makefile.sc new file mode 100644 index 0000000000..6245a2917d --- /dev/null +++ b/samples/validate/makefile.sc @@ -0,0 +1,37 @@ +# Purpose: makefile for validate example (Symantec C++) +# Created: 2000-03-14 + +WXDIR = $(WXWIN) +WXLIB = $(WXDIR)\lib\wx.lib +INCDIR = $(WXDIR)\include +INCLUDE=$(INCDIR) +TARGET=validate + +include $(WXDIR)\src\makesc.env + +validate.exe: validate.obj $(DEFFILE) validate.res + *$(CC) $(LDFLAGS) -o$@ $** $(LIBS) + *$(RC) -k validate.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/validate/makefile.sl b/samples/validate/makefile.sl new file mode 100644 index 0000000000..034d9f541e --- /dev/null +++ b/samples/validate/makefile.sl @@ -0,0 +1,14 @@ +# Purpose: makefile for validate example (Salford C++) +# Created: 2000-03-14 + +PROGRAM = validate +OBJECTS = $(PROGRAM).obj + +include ..\..\src\makeprog.sl + +all: wx $(TARGET) + +wx: + cd $(WXDIR)\src\msw ^ mk32 -f makefile.sl all + cd $(WXDIR)\samples\validate + diff --git a/samples/validate/makefile.twn b/samples/validate/makefile.twn new file mode 100644 index 0000000000..007a812ba4 --- /dev/null +++ b/samples/validate/makefile.twn @@ -0,0 +1,35 @@ +# Purpose: makefile for validate example (TWIN) +# Created: 2000-03-14 + +WXDIR = ../.. + +# All common UNIX compiler flags and options are now in +# this central makefile. +include $(WXDIR)/src/maketwin.env + +OBJECTS = $(OBJDIR)/validate.$(OBJSUFF) $(OBJDIR)/validate.$(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) + +validate.c: validate.rc + $(RESCOMP) $(RCINPUTSWITCH) validate.rc $(RCOUTPUTSWITCH) validate.c $(RESFLAGS) + +$(OBJDIR)/validate.$(OBJSUFF): validate.c + $(CC) -c $(CPPFLAGS) -o $@ validate.c + +#$(OBJDIR)/validate.o: validate.rc +# $(RESCOMP) $(RCINPUTSWITCH) validate.rc $(RCOUTPUTSWITCH) $(OBJDIR)/validate.o $(RESFLAGS) + +clean: + rm -f $(OBJECTS) validate$(GUISUFFIX).exe core *.rsc *.res diff --git a/samples/validate/makefile.unx b/samples/validate/makefile.unx new file mode 100644 index 0000000000..ef20878024 --- /dev/null +++ b/samples/validate/makefile.unx @@ -0,0 +1,23 @@ +# Purpose: makefile for validate example (Unix) +# Created: 2000-03-14 + +CC = gcc + +PROGRAM = validate + +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/validate/makefile.vc b/samples/validate/makefile.vc index 0db26a276c..f02ce2b916 100644 --- a/samples/validate/makefile.vc +++ b/samples/validate/makefile.vc @@ -1,12 +1,5 @@ -# -# 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 validate example (VC++ 32bit) +# Created: 2000-03-14 # Set WXDIR for your system WXDIR = $(WXWIN) diff --git a/samples/validate/makefile.wat b/samples/validate/makefile.wat index 2d8327bf01..94a59068a1 100644 --- a/samples/validate/makefile.wat +++ b/samples/validate/makefile.wat @@ -1,9 +1,5 @@ -# -# Makefile for WATCOM -# -# Created by Julian Smart, January 1999 -# -# +# Purpose: makefile for validate example (Watcom) +# Created: 2000-03-14 WXDIR = $(%WXWIN)