merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/text/makefile.b32

@@ -9,8 +9,17 @@
 
 WXDIR = $(WXWIN)
 
-TARGET=controls
+TARGET=texttst
 OBJECTS = $(TARGET).obj
 
+# We have to copy to a different root name,
+# since BC++ doesn't seem to like the name 'text'
+# when linking
+all: copyfiles $(TARGET).exe $(EXTRATARGETS)
+
 !include $(WXDIR)\src\makeprog.b32
 
+copyfiles:
+    copy text.cpp texttst.cpp
+    copy text.rc texttst.rc
+