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 28da4b485ffe37fbf25bc60c7b9ddd068463253c..a5dbfee06774e40ed16affc2a3265d526e09a121 100644 (file)
--- 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 7fe8642b419103bd02a25c3545193244d7821407..85c97f0f150b454557734a9bbc80c0a335d0a778 100644 (file)
--- 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 61cb92fb55613d19f13c365af9a296f6a5298ebc..01928afc6280f9f9f0ad004b9778a10f39096f91 100644 (file)
--- 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 9ade46c7502014372afeca3278c771ea90af3b97..9c8fcbf3c6101f40f36835d28bc913b6c6d56870 100644 (file)
--- 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 6fca67dc2be391bc95249e52239e1cba7eee8343..6292100f68d373210c8fe623020879a3c690b0ec 100644 (file)
--- 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 (file)
index 0000000..e1a3a1a
--- /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 (file)
index 0000000..9bdc37a
--- /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 (file)
index 0000000..b83cb49
--- /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 (file)
index 0000000..55d59a7
--- /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 2781f416aeff4738403e0a448b96a7afc0f1c11d..a3b548c5c6363140b32fceb01f6f9984975feefc 100644 (file)
--- 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 ff5c8e0457b2110b57f95853992949b10a6d2bb2..b81df8d74bd80cd9e3d59ea42d825b4160affb1b 100644 (file)
--- 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 (file)
index 0000000..594658a
--- /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 <ron@debian.org>
+
+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 2709bc19ff5323010b5e9a09a9db6b06925aeb16..900fe3b6861a80a00b3523b882d88a90b7c0b88b 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -20,8 +20,8 @@
 #include "wx/wx.h"
 #endif
 
-#include <wx/msw/wave.h>
-#include <wx/msw/joystick.h>
+#include <wx/wave.h>
+#include <wx/joystick.h>
 
 #include "joytest.h"
 

diff --git a/samples/joytest/makefile.b32 b/samples/joytest/makefile.b32
index 1ab531405a7fd690c768f674e89b1d3d9077d902..0b592c80425b6bd8ae8b8b8eca497f417fc8852c 100644 (file)
--- 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 d84ed492816c992abfaba87ad359cea7cd537e6c..51ff8dfd69a32281e92e628095c4547fd16a76f1 100644 (file)
--- 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 df94746c2ee67e0cce87a05cab2333d85779f305..ea15c62cceda3c2c7630d8e034aec59d060bcd27 100644 (file)
--- 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 565c1a9bfbb33216d710bf474605ca4db27a0521..67132e46c56a1ba1ec85600ae0c6c3842f71c7be 100644 (file)
--- 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 bcdcb11d549d7e578de058439cf9cbc5d4f976d1..be3c6ffd927a3024ec83ba9275ea16c502d98f55 100644 (file)
--- 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 (file)
index 0000000..8a8e642
--- /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 (file)
index 0000000..fcd9ea0
--- /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 7b60c08bea4be9fbfc89e274f6c35cafb863ccc0..1f0d1027d31cf1617d54751ef5d8564d2908cf6f 100644 (file)
--- 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 a4ef6737c23bb2f97eb67bf6b799a1846bd33d73..94f3d1e489842528be7e4c20e8b502a4fd8c34fb 100644 (file)
--- 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 57467717d1a3031d141a5bb36a26569dfd5d868b..8d1fd19ea3305100fa5950f174ee54285add13b7 100644 (file)
--- 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 (file)
index 464c4b4..0000000
--- 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 df53b87bab3b5c0888e6a377c6bdd2bc86aded42..93ce47b016a2fbcdd2c5c59fab9f44ad365515ea 100644 (file)
--- 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 (file)
index 0000000..40e131b
--- /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 (file)
index 0000000..9c53fae
--- /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 (file)
index 0000000..f38d18f
--- /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 587135b10df0d59c1e659a45f1b34cb91a3078d5..7c38b8a26a5daffdf7b782de8b628f35406217e1 100644 (file)
--- 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 (file)
index 0000000..50f7007
--- /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 (file)
index 0000000..707fd9e
--- /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 (file)
index 0000000..13d6508
--- /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 (file)
index 0000000..df61941
--- /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 c356f69b6fb8094a85a9255b896b84fb555edd13..c9eeb7ec216ce470b2c6666d8e5d52723a5fd5c2 100644 (file)
--- 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 (file)
index 0000000..f2cfc53
--- /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 (file)
index 0000000..bd016fe
--- /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 <ron@debian.org>
+
+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 b7654ce21b0436b7e3ddf69080b84a39564c88d2..5e2670d751369c37c1ad60bf7db5bd0ec68c31b8 100644 (file)
--- 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 ce219415a6d80d5ae0cd59a89083234ce2cd456f..45063d52419f181f13dde4093ef468f2207a2c3e 100644 (file)
--- 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 cb03e4dede44868ae6a1d9ee8d210718137193ce..102a239d11542b943779ae9996f477bcf253f681 100644 (file)
--- 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 (file)
index 0000000..b41a4fe
--- /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 868594ea9828a3d524117623a2fb809ca7534bed..9e76f66b105739d0c0cf27279a82d0bee8406786 100644 (file)
--- 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 (file)
index 0000000..4c48c9e
--- /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 (file)
index 0000000..fa4aff8
--- /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 (file)
index 0000000..2205234
--- /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 (file)
index 0000000..4145bb6
--- /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 878493df4848135e6e2219c880c926d00b5d3b67..dd4d9791560b95ab8cb3d86654ad8c0b6408d2f4 100644 (file)
--- 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 8c4081d4a0b369b17932b795f4fb5e7ae15794f1..ddb80f32339f052c5817a381aafb47dfbd865afe 100644 (file)
--- 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 (file)
index 0000000..ba32b1f
--- /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 <ron@debian.org>
+
+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 a558fb674432e4198eb31986468325b949e28f7f..b16304b99592c9f33706876d7598856c2f254c2e 100644 (file)
--- 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 1645915c3a160d9a39f7a3018e203c6ab93b3b32..6cefc83007e813380e91bf281579b184b0da1f63 100644 (file)
--- 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 3694771dd1600054daa2b46be2513488f59b8019..a622b7c6aa990c439bfd9e9669e934148b3107c7 100644 (file)
--- 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 c98a1b1f01359829b6547ec4f205726fd8a7dfe4..bb6f8d0c488ef32bfb0f8e42d0ef485cd14c7911 100644 (file)
--- 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 d011eb9db7534e511ffd7222406fefd927c2ef62..25bcc5b88a78ad269dc3b191b212879cfbb86ddb 100644 (file)
--- 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 (file)
index 0000000..6de8e68
--- /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 (file)
index 0000000..216b087
--- /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 (file)
index 0000000..fd89e57
--- /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 (file)
index 0000000..91d51a0
--- /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 bbff798ce4c3cbf03410ffe8de4141f8cd6f592e..af02a4b4bda60d125872a3e453db7dcfaaddbd7c 100644 (file)
--- 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 8c27bfb8a961914d3c6a1342b8ff42dca46e47f4..95c26443ed5b8a1da9ad62e5d929a922348af740 100644 (file)
--- 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 1a78e48bd349fc2ff7cefa3fe9f17049fd723892..fff8979e534fcfd0e39d7d6f9f1a3c2d7f9204c3 100644 (file)
--- 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 7c366bcdde708558a7058e3208970ea1dc98f432..65e61b9b48fe439e2ce8b8d431fe9ec40177f300 100644 (file)
--- 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 0d0fee1bbc5ee0a3fd377121b2a1fd88c8a0db52..6b1bebecff0d24f4225fec0a6bcbe95caf34f79d 100644 (file)
--- 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 837e509b02a6e310113f8e90919b6331c825f7f3..90f8cb5003a2f512f2efd1da243fb8fb290ade7c 100644 (file)
--- 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 9d067c2c70194454b515070104165ffe371932bb..1fa426f4990acc8cfb1063cdd1fec1cfa6386461 100644 (file)
--- 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 (file)
index 0000000..dea8d1a
--- /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 (file)
index 0000000..6d7d6db
--- /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 (file)
index 0000000..56e0ceb
--- /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 (file)
index 0000000..3ec01bb
--- /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 f6b3d288bc5e519d0e44aaf9a87972df911b90ba..b6092b765666f5de356f30c4516e5c660573093a 100644 (file)
--- 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 a96f825f07b6210f6d49175d467336418276be4e..8efc4d6a0c2e99750c7dfc40af983a593a07e417 100644 (file)
--- 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 70e24d07e67d057ae8c475a02812721e599f7405..fc7bd3037f03ca8612a6980b92b06bec4a15d716 100644 (file)
--- 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 bdad7c2d919d96982f7d3b59a6e3ac0ce5892f3a..fe625e461a31d1544b85c6e9273921cd9bd0fa6c 100644 (file)
--- 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 781d93b453ecb20b37acfe7041c60c9f9617f627..9d0cbe3770ae5a89665eb12b06fa55f0bc07e452 100644 (file)
--- 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 b8a1ba210448c274f64dc2e8c4c25b66627236c6..8aa42c38e7197107797167767eaa6ab48cbf8497 100644 (file)
--- 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 593057f6ebfabb0172d0eeaeb01440ddb0ffd5b1..0b00e7e4f00997901e4e5097ced36c5c1fe671a6 100644 (file)
--- 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 (file)
index 0000000..6245a29
--- /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 (file)
index 0000000..034d9f5
--- /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 (file)
index 0000000..007a812
--- /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 (file)
index 0000000..ef20878
--- /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 0db26a276cde93b39dd6f0cd86945c7d17b44e82..f02ce2b9160b88d1a237eb4189752d53a4aa5f93 100644 (file)
--- 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 2d8327bf01124b6c6acf19c430bc5bde45a904ac..94a59068a14f5c898e9e199ca823aac9c12307f1 100644 (file)
--- 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)