Bug fix in GetLabelFromText

[wxWidgets.git] / samples / joytest / makefile.b32

diff --git a/samples/joytest/makefile.b32 b/samples/joytest/makefile.b32
index 7720955b44085163a8aa6d0bb668c492ce34db99..1ab531405a7fd690c768f674e89b1d3d9077d902 100644 (file)
--- a/samples/joytest/makefile.b32
+++ b/samples/joytest/makefile.b32
@@ -1,64 +1,16 @@
 #
 # File:                makefile.b32
-# Author:      Patrick Halke
-# Created:     1995
+# Author:      Julian Smart
+# Created:     1999
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
+# Copyright:
 #
-# "%W% %G%"
-#
-# Makefile : Builds 32bit MDI example.
-
-# WXWIN and BCCDIR are set by parent make
+# Makefile : Builds sample for 32-bit BC++
 
 WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WXLIBDIR = $(WXDIR)\lib
-WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
 
 TARGET=joytest
+OBJECTS = $(TARGET).obj
 
-!if "$(FINAL)" == "0"
-LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-OBJECTS = joytest.obj
-
-$(TARGET).exe: $(OBJECTS) $(TARGET).def $(TARGET).res
-  tlink32 $(LINKFLAGS) @&&!
-c0w32.obj $(OBJECTS)
-$(TARGET)
-nul
-$(LIBS)
-$(TARGET).def
-$(TARGET).res
-!
-
-.$(SRCSUFF).obj:
-       bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-       bcc32 $(CPPFLAGS) -P- -c {$< }
-
-joytest.obj:      joytest.$(SRCSUFF) joytest.h
-
-$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
-    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
-
+!include $(WXDIR)\src\makeprog.b32