compilation fix

[wxWidgets.git] / samples / makefile.b32

diff --git a/samples/makefile.b32 b/samples/makefile.b32
index 0c81281ef5ae3e7b44f06cdb3d83c2beed7d500c..8abf6fb57715332397006e6b6018401924839763 100644 (file)
--- a/samples/makefile.b32
+++ b/samples/makefile.b32
@@ -16,144 +16,308 @@ WXDIR = $(WXWIN)
 
 THISDIR=$(WXDIR)\samples
 
 
 THISDIR=$(WXDIR)\samples
 

+#
+# 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:
 all:

-        cd $(WXDIR)\samples\splitter
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\resource
-        make -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
         cd $(WXDIR)\samples\controls

-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\listctrl
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\treectrl
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\validate
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\mdi
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\minimal
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\layout
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\printing
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\toolbar
-        make -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
         cd $(WXDIR)\samples\dialogs

-        make -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
         cd $(WXDIR)\samples\docview

-        make -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)

         cd $(WXDIR)\samples\docvwmdi
         cd $(WXDIR)\samples\docvwmdi

-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\controls
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\nativdlg
-        make -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
         cd $(WXDIR)\samples\grid

-        make -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
         cd $(WXDIR)\samples\internat

-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\dnd
-        make -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)

         cd $(WXDIR)\samples\joytest
         cd $(WXDIR)\samples\joytest

-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\taskbar
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\sashtest
-        make -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
 !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
 !endif

-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\ownerdrw
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\checklst
-        make -f makefile.b32 FINAL=$(FINAL)

         cd $(WXDIR)\samples\minifram
         cd $(WXDIR)\samples\minifram

-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\bombs
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\fractal
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\wxpoem
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\typetest
-        make -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\minimal
+        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
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)

         cd $(WXDIR)\samples\proplist
         cd $(WXDIR)\samples\proplist

-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\image
-        make -f makefile.b32 FINAL=$(FINAL)
-        cd $(WXDIR)\samples\dde
-        make -f makefile.b32 FINAL=$(FINAL)
-#        cd $(WXDIR)\samples\regtest
-#        make -f makefile.b32 FINAL=$(FINAL)
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\regtest
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\resource
+        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
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\typetest
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
+        cd $(WXDIR)\samples\validate
+        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:
 
 clean:

-        cd $(WXDIR)\samples\splitter
+        cd $(WXDIR)\samples\calendar

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\mdi
+        cd $(WXDIR)\samples\caret

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\minimal
+        cd $(WXDIR)\samples\checklst

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\layout
+        cd $(WXDIR)\samples\config

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\printing
+        cd $(WXDIR)\samples\controls

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\toolbar
+        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
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\dialogs
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\resource
+        cd $(WXDIR)\samples\dnd
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\docview
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\docvwmdi
+        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
+        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
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\joytest
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\layout

         make -f makefile.b32 clean
         cd $(WXDIR)\samples\listctrl
         make -f makefile.b32 clean
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\listctrl
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\treectrl
+        cd $(WXDIR)\samples\mdi

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\validate
+!if "$(FINAL)" == "0"
+        cd $(WXDIR)\samples\memcheck

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\docview
+!endif
+        cd $(WXDIR)\samples\mfc

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\docvwmdi
+        cd $(WXDIR)\samples\menu

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\controls
+        cd $(WXDIR)\samples\minifram
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\minimal

         make -f makefile.b32 clean
         cd $(WXDIR)\samples\nativdlg
         make -f makefile.b32 clean
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\nativdlg
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\grid
+        cd $(WXDIR)\samples\dialup

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\internat
+        cd $(WXDIR)\samples\notebook

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\checklst
+        cd $(WXDIR)\samples\oleauto

         make -f makefile.b32 clean
         cd $(WXDIR)\samples\ownerdrw
         make -f makefile.b32 clean
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\ownerdrw
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\dnd
+        cd $(WXDIR)\samples\png

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\joytest
+        cd $(WXDIR)\samples\printing
+        make -f makefile.b32 clean
+        cd $(WXDIR)\samples\proplist

         make -f makefile.b32 clean
         cd $(WXDIR)\samples\regtest
         make -f makefile.b32 clean
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\regtest
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\taskbar
+        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
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\sashtest
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\memcheck
+        cd $(WXDIR)\samples\scroll

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\minifram
+        cd $(WXDIR)\samples\scrollsub

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\bombs
+        cd $(WXDIR)\samples\splitter

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\fractal
+        cd $(WXDIR)\samples\tab

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\wxpoem
+        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
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\typetest
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\proplist
+        cd $(WXDIR)\samples\validate

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\image
+!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
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples\dde
+        cd $(WXDIR)\samples\widgets

         make -f makefile.b32 clean
         make -f makefile.b32 clean

-        cd $(WXDIR)\samples