X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0b3964149a61fee08b40bf9ab70191641a9002a..a81c3c2383f9096ef5e96b708a0f1c1ffe7cc6a8:/samples/makefile.b32

diff --git a/samples/makefile.b32 b/samples/makefile.b32
index 1ea9ea55d0..de856f954e 100644
--- a/samples/makefile.b32
+++ b/samples/makefile.b32
@@ -29,7 +29,7 @@ COMPIL=1
 PNGSETUP=
 # Need wxUSE_ODBC; define this to compile db sample
 ODBCSETUP=
-
+WXUSINGDLL=0
 
 #
 # Please keep samples list up-to-date, in alphabetical order
@@ -79,6 +79,8 @@ all:
         cd $(WXDIR)\samples\html
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
 !endif
+        cd $(WXDIR)\samples\keyboard
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\image
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\internat
@@ -127,10 +129,6 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\resource
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
-!if "$(COMPIL)"==""
-        cd $(WXDIR)\samples\richedit
-        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
-!endif
         cd $(WXDIR)\samples\rotate
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\sashtest
@@ -165,8 +163,6 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\exec
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
-        cd $(WXDIR)\samples\richedit
-        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\statbar
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\sockets
@@ -185,6 +181,8 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
 
 clean:
+        cd $(WXDIR)\samples\artprov
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\calendar
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\caret
@@ -225,6 +223,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\internat
         make -f makefile.b32 clean
+        cd $(WXDIR)\samples\keyboard
+        make -f makefile.b32 clean
         cd $(WXDIR)\samples\joytest
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\layout
@@ -233,10 +233,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\mdi
         make -f makefile.b32 clean
-!if "$(FINAL)" == "0"
         cd $(WXDIR)\samples\memcheck
         make -f makefile.b32 clean
-!endif
         cd $(WXDIR)\samples\mfc
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\menu
@@ -265,8 +263,6 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\resource
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\richedit
-        make -f makefile.b32 clean
         cd $(WXDIR)\samples\rotate
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\sashtest
@@ -293,10 +289,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\validate
         make -f makefile.b32 clean
-!if "$(NOMAKE)"==""
         cd $(WXDIR)\samples\wizard
         make -f makefile.b32 clean
-!endif
         cd $(WXDIR)\samples\dragimag
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\erase
@@ -307,11 +301,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\statbar
         make -f makefile.b32 clean
-        cd $(WXDIR)\samples\richedit
-        make -f makefile.b32 clean
         cd $(WXDIR)\samples\propsize
         make -f makefile.b32 clean
-
         cd $(WXDIR)\samples\sockets
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\treelay