moved Destroy() to the beginning

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

diff --git a/samples/joytest/makefile.dos b/samples/joytest/makefile.dos
index b2ddbcf9f5ef1107cd5761f9dd748e665d45fc6d..df94746c2ee67e0cce87a05cab2333d85779f305 100644 (file)
--- a/samples/joytest/makefile.dos
+++ b/samples/joytest/makefile.dos
@@ -1,63 +1,17 @@
 #
 # File:                makefile.dos
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1998
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
-# "%W% %G%"
-#
-# Makefile : Builds joytest example (DOS).
+# Makefile : Builds 16-bit sample, VC++ 1.5
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
 WXDIR = $(WXWIN)
 
-!include $(WXDIR)\src\makemsc.env
-
-THISDIR = $(WXDIR)\samples\joytest
-INC=/I$(WXDIR)\include
-
-HEADERS = joytest.h
-SOURCES = joytest.$(SRCSUFF)
-OBJECTS = joytest.obj
-
-all:    joytest.exe
-
-wx:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.dos
-        cd $(THISDIR)
-
-wxclean:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.dos clean
-        cd $(THISDIR)
-
-
-joytest.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) joytest.obj joytest.def joytest.res
-        link $(LINKFLAGS) @<<
-$(WXDIR)\src\msw\dummy.obj joytest.obj,
-joytest,
-NUL,
-$(LIBS),
-joytest.def
-;
-<<
-        rc -K joytest.res
-
-joytest.obj:      joytest.h joytest.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
-<<
+TARGET=joytest
+OBJECTS = $(TARGET).obj
 
-joytest.res :      joytest.rc $(WXDIR)\include\wx\msw\wx.rc
-    rc -r /i$(WXDIR)\include joytest
+!include $(WXDIR)\src\makeprog.msc
 
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb