X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48c12cb1290224f44161d9af774170d5f0fae440..9199e66fb56bc80b81b91f59250df78d7197052e:/samples/makefile.vc

diff --git a/samples/makefile.vc b/samples/makefile.vc
index d118850306..104d18e413 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -26,7 +26,7 @@ NOMAKE=1
 # Misc. compilation errors
 COMPIL=1
 # Need PNG
-PNGSETUP=1
+PNGSETUP=
 
 !include $(WXDIR)\src\makemsc.env
 
@@ -44,10 +44,8 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\controls
         nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
         cd $(WXDIR)\samples\db
         nmake -f makefile.vc FINAL=$(FINAL)
-!endif
         cd $(WXDIR)\samples\dde
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\dialogs
@@ -62,12 +60,16 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\dynamic
         nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\samples\font
+        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)
         cd $(WXDIR)\samples\grid
         nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\samples\newgrid
+        nmake -f makefile.vc FINAL=$(FINAL)
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\help
         nmake -f makefile.vc FINAL=$(FINAL)
@@ -88,6 +90,8 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\mdi
         nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\samples\menu
+        nmake -f makefile.vc FINAL=$(FINAL)
 !if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
         nmake -f makefile.vc FINAL=$(FINAL)
@@ -102,6 +106,8 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\nativdlg
         nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\samples\nettest
+        nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\notebook
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\oleauto
@@ -114,10 +120,8 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\proplist
         nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
         cd $(WXDIR)\samples\regtest
         nmake -f makefile.vc FINAL=$(FINAL)
-!endif
         cd $(WXDIR)\samples\resource
         nmake -f makefile.vc FINAL=$(FINAL)
 !if "$(COMPIL)"==""
@@ -128,14 +132,14 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\scroll
         nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\samples\scrollsub
+        nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\splitter
         nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
         cd $(WXDIR)\samples\tab
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\taskbar
         nmake -f makefile.vc FINAL=$(FINAL)
-!endif
         cd $(WXDIR)\samples\text
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\thread
@@ -144,22 +148,16 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\treectrl
         nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(COMPIL)"==""
         cd $(WXDIR)\samples\typetest
         nmake -f makefile.vc FINAL=$(FINAL)
-!endif
         cd $(WXDIR)\samples\validate
         nmake -f makefile.vc FINAL=$(FINAL)
-!if "$(NOMAKE)"==""
         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
 
 clean:
         cd $(WXDIR)\samples\bombs
@@ -188,12 +186,16 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\dynamic
         nmake -f makefile.vc clean
+        cd $(WXDIR)\samples\font
+        nmake -f makefile.vc clean
         cd $(WXDIR)\samples\forty
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\fractal
         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 +218,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\nettest
+        nmake -f makefile.vc clean
         cd $(WXDIR)\samples\notebook
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\oleauto
@@ -244,6 +250,8 @@ clean:
         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