Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

[wxWidgets.git] / samples / makefile.dos

diff --git a/samples/makefile.dos b/samples/makefile.dos
index 8537373e549ae36164430d2a8c62619b1dbe51bb..4aa5e3fb7518635f9effd9d5a1d4a889bb0bbdfd 100644 (file)
--- a/samples/makefile.dos
+++ b/samples/makefile.dos
@@ -3,7 +3,7 @@
 # Author:      Julian Smart
 # Created:     1993
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:   
 #
 # "%W% %G%"
 #
@@ -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
 
@@ -36,6 +32,8 @@ COMPIL=1
 # Please keep samples list up-to-date, in alphabetical order
 #
 all:
+        cd $(WXDIR)\samples\artprov
+        nmake -f makefile.dos FINAL=$(FINAL)
         cd $(WXDIR)\samples\bombs
         nmake -f makefile.dos FINAL=$(FINAL)
         cd $(WXDIR)\samples\caret
@@ -54,7 +52,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 +75,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)
@@ -122,24 +116,16 @@ all:
 !endif
         cd $(WXDIR)\samples\printing
         nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(WXDIR)\samples\proplist
-        nmake -f makefile.dos FINAL=$(FINAL)
 !if "$(NOMAKE)"==""
         cd $(WXDIR)\samples\regtest
         nmake -f makefile.dos FINAL=$(FINAL)
 !endif
-        cd $(WXDIR)\samples\resource
-        nmake -f makefile.dos FINAL=$(FINAL)
 !if "$(NOMAKE)"==""
-        cd $(WXDIR)\samples\richedit
-        nmake -f makefile.dos FINAL=$(FINAL)
         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 +142,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 +199,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
@@ -253,17 +235,11 @@ clean:
 !endif
         cd $(WXDIR)\samples\printing
         nmake -f makefile.dos clean
-        cd $(WXDIR)\samples\proplist
-        nmake -f makefile.dos clean
 !if "$(NOMAKE)"==""
         cd $(WXDIR)\samples\regtest
         nmake -f makefile.dos clean
 !endif
-        cd $(WXDIR)\samples\resource
-        nmake -f makefile.dos clean
 !if "$(NOMAKE)"==""
-        cd $(WXDIR)\samples\richedit
-        nmake -f makefile.dos clean
         cd $(WXDIR)\samples\sashtest
         nmake -f makefile.dos clean
 !endif