X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48c12cb1290224f44161d9af774170d5f0fae440..0c9a1c32795ae9b1affd71b97f3e309611eb1cc5:/samples/makefile.vc?ds=inline

diff --git a/samples/makefile.vc b/samples/makefile.vc
index d118850306..aef0d99c4d 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -26,143 +26,143 @@ NOMAKE=1
 # Misc. compilation errors
 COMPIL=1
 # Need PNG
-PNGSETUP=1
+PNGSETUP=
 
 !include $(WXDIR)\src\makemsc.env
 
+MAKEFLAGS=FINAL=$(FINAL) UNICODE=$(UNICODE) WXUSINGDLL=$(WXUSINGDLL)
+
 #
 # Please keep samples list up-to-date, in alphabetical order
 #
 all:
-        cd $(WXDIR)\samples\bombs
-        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\samples\calendar
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\caret
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\checklst
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\config
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\controls
-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\db
-        nmake -f makefile.vc FINAL=$(FINAL)
-!endif
-        cd $(WXDIR)\samples\dde
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
+        cd $(WXDIR)\samples\ipc
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\dialogs
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\dnd
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\docview
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\docvwmdi
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\drawing
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\dynamic
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\samples\forty
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\samples\fractal
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
+        cd $(WXDIR)\samples\font
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\grid
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
+        cd $(WXDIR)\samples\newgrid
+        nmake -f makefile.vc $(MAKEFLAGS)
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\help
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
 !if "$(PNGSETUP)"==""
         cd $(WXDIR)\samples\html
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
         cd $(WXDIR)\samples\image
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\internat
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\joytest
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\layout
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\listctrl
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\mdi
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
+        cd $(WXDIR)\samples\menu
+        nmake -f makefile.vc $(MAKEFLAGS)
 !if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\mfc
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
         cd $(WXDIR)\samples\minifram
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\minimal
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\nativdlg
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
+!if "$(COMPIL)"==""
+        cd $(WXDIR)\samples\dialup
+        nmake -f makefile.vc $(MAKEFLAGS)
+!endif
         cd $(WXDIR)\samples\notebook
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\oleauto
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\ownerdrw
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\png
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\printing
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\proplist
-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\regtest
-        nmake -f makefile.vc FINAL=$(FINAL)
-!endif
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\resource
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\richedit
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
+        cd $(WXDIR)\samples\rotate
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\sashtest
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\scroll
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
+        cd $(WXDIR)\samples\scrollsub
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\splitter
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\tab
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\samples\taskbar
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
 !endif
+        cd $(WXDIR)\samples\taskbar
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\text
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\thread
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\toolbar
-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\treectrl
-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\typetest
-        nmake -f makefile.vc FINAL=$(FINAL)
-!endif
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\validate
-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(NOMAKE)"==""
+        nmake -f makefile.vc $(MAKEFLAGS)
         cd $(WXDIR)\samples\wizard
-        nmake -f makefile.vc FINAL=$(FINAL)
-!endif
-        cd $(WXDIR)\samples\wxpoem
-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
-        cd $(WXDIR)\samples\wxsocket
-        nmake -f makefile.vc FINAL=$(FINAL)
-!endif
+        nmake -f makefile.vc $(MAKEFLAGS)
+        cd $(WXDIR)\samples\sockets
+        nmake -f makefile.vc $(MAKEFLAGS)
 
 clean:
-        cd $(WXDIR)\samples\bombs
+        cd $(WXDIR)\samples\calendar
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\caret
         nmake -f makefile.vc clean
@@ -174,7 +174,7 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\db
         nmake -f makefile.vc clean
-        cd $(WXDIR)\samples\dde
+        cd $(WXDIR)\samples\ipc
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\dialogs
         nmake -f makefile.vc clean
@@ -188,12 +188,12 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\dynamic
         nmake -f makefile.vc clean
-        cd $(WXDIR)\samples\forty
-        nmake -f makefile.vc clean
-        cd $(WXDIR)\samples\fractal
+        cd $(WXDIR)\samples\font
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\grid
         nmake -f makefile.vc clean
+        cd $(WXDIR)\samples\newgrid
+        nmake -f makefile.vc clean
         cd $(WXDIR)\samples\help
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\html
@@ -216,12 +216,16 @@ clean:
 !endif
         cd $(WXDIR)\samples\mfc
         nmake -f makefile.vc clean
+        cd $(WXDIR)\samples\menu
+        nmake -f makefile.vc clean
         cd $(WXDIR)\samples\minifram
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\minimal
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\nativdlg
         nmake -f makefile.vc clean
+        cd $(WXDIR)\samples\dialup
+        nmake -f makefile.vc clean
         cd $(WXDIR)\samples\notebook
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\oleauto
@@ -240,10 +244,14 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\richedit
         nmake -f makefile.vc clean
+        cd $(WXDIR)\samples\rotate
+        nmake -f makefile.vc clean
         cd $(WXDIR)\samples\sashtest
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\scroll
         nmake -f makefile.vc clean
+        cd $(WXDIR)\samples\scrollsub
+        nmake -f makefile.vc clean
         cd $(WXDIR)\samples\splitter
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\tab
@@ -266,8 +274,6 @@ clean:
         cd $(WXDIR)\samples\wizard
         nmake -f makefile.vc clean
 !endif
-        cd $(WXDIR)\samples\wxpoem
-        nmake -f makefile.vc clean
-        cd $(WXDIR)\samples\wxsocket
+        cd $(WXDIR)\samples\sockets
         nmake -f makefile.vc clean