Re-added a minimal setup.h file that includes wx/msw/setup.h on Windows,

[wxWidgets.git] / samples / makefile.vc

diff --git a/samples/makefile.vc b/samples/makefile.vc
index d11885030622a1ccfb09944280907bef0dc845c6..aef0d99c4dc840aa53775f4b282bc25a801b3926 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -26,143 +26,143 @@ NOMAKE=1
 # Misc. compilation errors
 COMPIL=1
 # Need PNG
 # Misc. compilation errors
 COMPIL=1
 # Need PNG

-PNGSETUP=1
+PNGSETUP=

 
 !include $(WXDIR)\src\makemsc.env
 
 
 !include $(WXDIR)\src\makemsc.env
 

+MAKEFLAGS=FINAL=$(FINAL) UNICODE=$(UNICODE) WXUSINGDLL=$(WXUSINGDLL)
+

 #
 # Please keep samples list up-to-date, in alphabetical order
 #
 all:
 #
 # 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
         cd $(WXDIR)\samples\caret

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\checklst
         cd $(WXDIR)\samples\checklst

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\config
         cd $(WXDIR)\samples\config

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\controls
         cd $(WXDIR)\samples\controls

-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\db
         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
         cd $(WXDIR)\samples\dialogs

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\dnd
         cd $(WXDIR)\samples\dnd

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\docview
         cd $(WXDIR)\samples\docview

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

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

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\drawing
         cd $(WXDIR)\samples\drawing

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\dynamic
         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
         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
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\help

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !endif
 !if "$(PNGSETUP)"==""
         cd $(WXDIR)\samples\html
 !endif
 !if "$(PNGSETUP)"==""
         cd $(WXDIR)\samples\html

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !endif
         cd $(WXDIR)\samples\image
 !endif
         cd $(WXDIR)\samples\image

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\internat
         cd $(WXDIR)\samples\internat

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

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

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\layout
         cd $(WXDIR)\samples\layout

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\listctrl
         cd $(WXDIR)\samples\listctrl

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\mdi
         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
 !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
 !endif
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\mfc

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

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

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\minimal
         cd $(WXDIR)\samples\minimal

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\nativdlg
         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
         cd $(WXDIR)\samples\notebook

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\oleauto
         cd $(WXDIR)\samples\oleauto

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\ownerdrw
         cd $(WXDIR)\samples\ownerdrw

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\png
         cd $(WXDIR)\samples\png

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\printing
         cd $(WXDIR)\samples\printing

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

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

-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\regtest
         cd $(WXDIR)\samples\regtest

-        nmake -f makefile.vc FINAL=$(FINAL)
-!endif
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\resource
         cd $(WXDIR)\samples\resource

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\richedit
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\richedit

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !endif
 !endif

+        cd $(WXDIR)\samples\rotate
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\sashtest
         cd $(WXDIR)\samples\sashtest

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\scroll
         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
         cd $(WXDIR)\samples\splitter

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\tab
 !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
 !endif

+        cd $(WXDIR)\samples\taskbar
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\text
         cd $(WXDIR)\samples\text

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\thread
         cd $(WXDIR)\samples\thread

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\toolbar
         cd $(WXDIR)\samples\toolbar

-        nmake -f makefile.vc FINAL=$(FINAL)
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\treectrl
         cd $(WXDIR)\samples\treectrl

-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\typetest
         cd $(WXDIR)\samples\typetest

-        nmake -f makefile.vc FINAL=$(FINAL)
-!endif
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\validate
         cd $(WXDIR)\samples\validate

-        nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(NOMAKE)"==""
+        nmake -f makefile.vc $(MAKEFLAGS)

         cd $(WXDIR)\samples\wizard
         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:
 
 clean:

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

         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\caret
         nmake -f makefile.vc clean
         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
         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
         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
         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
         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
         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
 !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\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
         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
         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\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
         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\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
 
         nmake -f makefile.vc clean