removed assert from wxColour::InitFromName() as there is no way to bypass it (see...

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

diff --git a/samples/ownerdrw/makefile.dos b/samples/ownerdrw/makefile.dos
index 71c72681ac0631f54992d79e14043f7c1cb63a07..8dc0bc94452f7f2df941deca16657e195a7461ab 100644 (file)
--- a/samples/ownerdrw/makefile.dos
+++ b/samples/ownerdrw/makefile.dos
@@ -1,65 +1,17 @@
 #
 # File:                makefile.dos
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1998
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
-# "%W% %G%"
-#
-# Makefile : Builds ownerdrw 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\ownerdrw
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-HEADERS =
-SOURCES = ownerdrw.$(SRCSUFF)
-OBJECTS = ownerdrw.obj
-
-all:    ownerdrw.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)
-
-ownerdrw.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) ownerdrw.obj ownerdrw.def ownerdrw.res
-        link $(LINKFLAGS) @<<
-ownerdrw.obj $(WXDIR)\src\msw\dummy.obj,
-ownerdrw,
-NUL,
-$(LIBS),
-ownerdrw.def
-;
-<<
-        rc -K ownerdrw.res
-
-ownerdrw.obj:      ownerdrw.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
-<<
+TARGET=ownerdrw
+OBJECTS = $(TARGET).obj
 
-ownerdrw.res :      ownerdrw.rc $(WXDIR)\include\wx\msw\wx.rc
-    rc -r /i$(WXDIR)\include ownerdrw
+!include $(WXDIR)\src\makeprog.msc
 
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb