In GetPath(), don't append separator if there's already one at the end

[wxWidgets.git] / samples / makefile.b32

diff --git a/samples/makefile.b32 b/samples/makefile.b32
index 8abf6fb57715332397006e6b6018401924839763..de856f954ebc241e91363225b6ed17e62001ea70 100644 (file)
--- a/samples/makefile.b32
+++ b/samples/makefile.b32
@@ -29,12 +29,14 @@ COMPIL=1
 PNGSETUP=
 # Need wxUSE_ODBC; define this to compile db sample
 ODBCSETUP=
 PNGSETUP=
 # Need wxUSE_ODBC; define this to compile db sample
 ODBCSETUP=

-
+WXUSINGDLL=0

 
 #
 # Please keep samples list up-to-date, in alphabetical order
 # not alphabetically organised ; 29 Nov 01
 all:
 
 #
 # Please keep samples list up-to-date, in alphabetical order
 # not alphabetically organised ; 29 Nov 01
 all:

+        cd $(WXDIR)\samples\artprov
+        make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)

         cd $(WXDIR)\samples\calendar
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\caret
         cd $(WXDIR)\samples\calendar
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\caret


@@ -77,6 +79,8 @@ all:
         cd $(WXDIR)\samples\html
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
 !endif
         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
         cd $(WXDIR)\samples\image
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\internat


@@ -125,10 +129,6 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\resource
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         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
         cd $(WXDIR)\samples\rotate
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\sashtest


@@ -163,8 +163,6 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\exec
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         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
         cd $(WXDIR)\samples\statbar
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
         cd $(WXDIR)\samples\sockets


@@ -183,6 +181,8 @@ all:
         make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
 
 clean:
         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
         cd $(WXDIR)\samples\calendar
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\caret


@@ -223,6 +223,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\internat
         make -f makefile.b32 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
         cd $(WXDIR)\samples\joytest
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\layout


@@ -231,10 +233,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\mdi
         make -f makefile.b32 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
         cd $(WXDIR)\samples\memcheck
         make -f makefile.b32 clean

-!endif

         cd $(WXDIR)\samples\mfc
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\menu
         cd $(WXDIR)\samples\mfc
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\menu


@@ -263,8 +263,6 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\resource
         make -f makefile.b32 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
         cd $(WXDIR)\samples\rotate
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\sashtest


@@ -291,10 +289,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\validate
         make -f makefile.b32 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
         cd $(WXDIR)\samples\wizard
         make -f makefile.b32 clean

-!endif

         cd $(WXDIR)\samples\dragimag
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\erase
         cd $(WXDIR)\samples\dragimag
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\erase


@@ -305,11 +301,8 @@ clean:
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\statbar
         make -f makefile.b32 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\propsize
         make -f makefile.b32 clean

-

         cd $(WXDIR)\samples\sockets
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\treelay
         cd $(WXDIR)\samples\sockets
         make -f makefile.b32 clean
         cd $(WXDIR)\samples\treelay