Modified to use the newly defined names for functions/classes/structs defined to...

[wxWidgets.git] / samples / makefile.dos

diff --git a/samples/makefile.dos b/samples/makefile.dos
index 8537373e549ae36164430d2a8c62619b1dbe51bb..2329f029b34529458af044a9c1e72fafe3c61a94 100644 (file)
--- a/samples/makefile.dos
+++ b/samples/makefile.dos
@@ -23,10 +23,6 @@ THISDIR=$(WXDIR)\samples
 NOMAKE=1
 # No 16 bit version
 ONLY32=1
-# PNG unresolved
-PNGSETUP=1
-# DND not set in setup.h
-DNDSETUP=1
 # Misc. compilation errors
 COMPIL=1
 
@@ -54,7 +50,7 @@ all:
         nmake -f makefile.dos FINAL=$(FINAL)
         cd $(WXDIR)\samples\dialogs
         nmake -f makefile.dos FINAL=$(FINAL)
-!if "$(DNDSETUP)"==""
+!if "$(ONLY32)"==""
         cd $(WXDIR)\samples\dnd
         nmake -f makefile.dos FINAL=$(FINAL)
 !endif
@@ -77,10 +73,6 @@ all:
         nmake -f makefile.dos FINAL=$(FINAL)
         cd $(WXDIR)\samples\html
         nmake -f makefile.dos FINAL=$(FINAL)
-!endif
-!if "$(PNGSETUP)"==""
-        cd $(WXDIR)\samples\image
-        nmake -f makefile.dos FINAL=$(FINAL)
 !endif
         cd $(WXDIR)\samples\internat
         nmake -f makefile.dos FINAL=$(FINAL)
@@ -136,10 +128,8 @@ all:
         cd $(WXDIR)\samples\sashtest
         nmake -f makefile.dos FINAL=$(FINAL)
 !endif
-!if "$(PNGSETUP)"==""
         cd $(WXDIR)\samples\scroll
         nmake -f makefile.dos FINAL=$(FINAL)
-!endif
         cd $(WXDIR)\samples\splitter
         nmake -f makefile.dos FINAL=$(FINAL)
 !if "$(COMPIL)"==""
@@ -156,10 +146,8 @@ all:
 !endif
         cd $(WXDIR)\samples\toolbar
         nmake -f makefile.dos FINAL=$(FINAL)
-!if "$(PNGSETUP)"==""
         cd $(WXDIR)\samples\treectrl
         nmake -f makefile.dos FINAL=$(FINAL)
-!endif
 !if "$(COMPIL)"==""
         cd $(WXDIR)\samples\typetest
         nmake -f makefile.dos FINAL=$(FINAL)
@@ -215,8 +203,6 @@ clean:
         cd $(WXDIR)\samples\html
         nmake -f makefile.dos clean
 !endif
-        cd $(WXDIR)\samples\image
-        nmake -f makefile.dos clean
         cd $(WXDIR)\samples\internat
         nmake -f makefile.dos clean
         cd $(WXDIR)\samples\joytest