X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fed485e0946d9cff74fce6afdb169796d90a99f2..30827629fa11f6365f69bd2917e1a35d22c35363:/samples/makefile.b32

diff --git a/samples/makefile.b32 b/samples/makefile.b32
index 465f71c58e..8abf6fb577 100644
--- a/samples/makefile.b32
+++ b/samples/makefile.b32
@@ -8,7 +8,7 @@
 # "%W% %G%"
 #
 # Makefile : Builds samples for Win95, BC++ WIN32
-# Use FINAL=1 argument to nmake to build final version with no debugging
+# Use FINAL=1 argument to make to build final version with no debugging
 # info
 
 # Set WXDIR for your system
@@ -16,146 +16,308 @@ WXDIR = $(WXWIN)
 
 THISDIR=$(WXDIR)\samples
 
-!include $(WXDIR)\src\makevc.env
+#
+# Indicates kind of pb with samples
+#
+# No makefile.vc file
+NOMAKE=1
+# No 16 bit version
+#ONLY32=1
+# Misc. compilation errors
+COMPIL=1
+# Need PNG
+PNGSETUP=
+# Need wxUSE_ODBC; define this to compile db sample
+ODBCSETUP=
+
 
+#
+# Please keep samples list up-to-date, in alphabetical order
+# not alphabetically organised ; 29 Nov 01
 all:
-        cd $(WXDIR)\samples\splitter
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\resource
-        nmake -f makefile.b32 FINAL=$(FINAL)
+        cd $(WXDIR)\samples\calendar
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\caret
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\checklst
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\config
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\controls
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\listctrl
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\treectrl
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\validate
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\mdi
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\minimal
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\layout
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\printing
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\toolbar
-        nmake -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+!if "$(ODBCSETUP)"=="1"
+        cd $(WXDIR)\samples\db
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+!endif
+        cd $(WXDIR)\samples\ipc
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\dialogs
-        nmake -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\dnd
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\docview
-        nmake -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\docvwmdi
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\controls
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\nativdlg
-        nmake -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\drawing
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\dynamic
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\font
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\grid
-        nmake -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\newgrid
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+
+        cd $(WXDIR)\samples\help
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+
+!if "$(PNGSETUP)"==""
+        cd $(WXDIR)\samples\html
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+!endif
+        cd $(WXDIR)\samples\image
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\internat
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\dnd
-        nmake -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\joytest
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\taskbar
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\sashtest
-        nmake -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\layout
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\listctrl
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\mdi
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\menu
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
 !if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+!endif
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\mfc
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
 !endif
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\ownerdrw
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\checklst
-        nmake -f makefile.b32 FINAL=$(FINAL)
         cd $(WXDIR)\samples\minifram
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\bombs
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\fractal
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\wxpoem
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\typetest
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\proplist
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\image
-        nmake -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\dde
-        nmake -f makefile.b32 FINAL=$(FINAL)
-#        cd $(WXDIR)\samples\regtest
-#        nmake -f makefile.b32 FINAL=$(FINAL)
-
-clean:
-        cd $(WXDIR)\samples\splitter
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\mdi
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\minimal
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\layout
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\nativdlg
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\dialup
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+!endif
+        cd $(WXDIR)\samples\notebook
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\oleauto
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\ownerdrw
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\png
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\printing
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\toolbar
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\dialogs
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\proplist
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\regtest
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\resource
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\listctrl
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\richedit
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+!endif
+        cd $(WXDIR)\samples\rotate
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\sashtest
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\scroll
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\scrollsub
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\splitter
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\tab
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+!endif
+        cd $(WXDIR)\samples\taskbar
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\text
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\thread
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\toolbar
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\treectrl
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\typetest
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\validate
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\wizard
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\dragimag
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\exec
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\richedit
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\statbar
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\sockets
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\widgets
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\tab
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\treelay
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\erase
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\event
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\propsize
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+
+clean:
+        cd $(WXDIR)\samples\calendar
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\caret
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\checklst
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\config
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\controls
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\db
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\ipc
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\dialogs
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\dnd
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\docview
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\docvwmdi
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\controls
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\nativdlg
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\drawing
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\dynamic
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\font
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\grid
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\newgrid
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\help
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\html
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\image
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\internat
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\checklst
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\ownerdrw
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\dnd
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\joytest
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\regtest
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\taskbar
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\sashtest
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\layout
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\listctrl
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\mdi
+        make -f makefile.b32 clean
+!if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 clean
+!endif
+        cd $(WXDIR)\samples\mfc
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\menu
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\minifram
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\bombs
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\fractal
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\wxpoem
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\typetest
-        nmake -f makefile.b32 clean
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\minimal
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\nativdlg
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\dialup
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\notebook
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\oleauto
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\ownerdrw
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\png
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\printing
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\proplist
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\image
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples\dde
-        nmake -f makefile.b32 clean
-        cd $(WXDIR)\samples
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\regtest
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\resource
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\richedit
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\rotate
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\sashtest
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\scroll
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\scrollsub
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\splitter
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\tab
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\taskbar
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\text
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\thread
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\toolbar
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\treectrl
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\typetest
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\validate
+        make -f makefile.b32 clean
+!if "$(NOMAKE)"==""
+        cd $(WXDIR)\samples\wizard
+        make -f makefile.b32 clean
+!endif
+        cd $(WXDIR)\samples\dragimag
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\erase
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\exec
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\event
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\statbar
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\richedit
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\propsize
+        make -f makefile.b32 clean
+
+        cd $(WXDIR)\samples\sockets
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\treelay
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\treectrl
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\tab
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\widgets
+        make -f makefile.b32 clean