Fix for MGL link error

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

diff --git a/samples/typetest/makefile.dos b/samples/typetest/makefile.dos
index 0c9debf866ee022ea5025f74b5609280c0f16d7e..90f8cb5003a2f512f2efd1da243fb8fb290ade7c 100644 (file)
--- a/samples/typetest/makefile.dos
+++ b/samples/typetest/makefile.dos
@@ -1,65 +1,10 @@
-#
-# File:                makefile.dos
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds typetest example (DOS).
-# Use FINAL=1 argument to nmake to build final version with no debugging
-# info
+# Purpose: makefile for typetest example (VC++ 1.5x)
+# Created: 2000-03-14
 
 WXDIR = $(WXWIN)
 
-!include $(WXDIR)\src\makemsc.env
+TARGET=typetest
+OBJECTS=$(TARGET).obj
 
-THISDIR = $(WXDIR)\samples\typetest
+!include $(WXDIR)\src\makeprog.msc
 
-!ifndef FINAL
-FINAL=0
-!endif
-
-HEADERS =
-SOURCES = typetest.$(SRCSUFF)
-OBJECTS = typetest.obj
-
-all:    typetest.exe
-
-wx:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.dos FINAL=$(FINAL)
-        cd $(THISDIR)
-
-wxclean:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.dos clean
-        cd $(THISDIR)
-
-typetest.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) typetest.obj typetest.def typetest.res
-        link $(LINKFLAGS) @<<
-typetest.obj $(WXDIR)\src\msw\dummy.obj,
-typetest,
-NUL,
-$(LIBS),
-typetest.def
-;
-<<
-        rc -K typetest.res
-
-typetest.obj:      typetest.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
-<<
-
-typetest.res :      typetest.rc $(WXDIR)\include\wx\msw\wx.rc
-    rc -r /i$(WXDIR)\include typetest
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb