Fix for VA 4.0

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

diff --git a/samples/toolbar/makefile.dos b/samples/toolbar/makefile.dos
index 98f93ab7bbb6866580eb779ab4c5e8fe3a5ca986..c98a1b1f01359829b6547ec4f205726fd8a7dfe4 100644 (file)
--- a/samples/toolbar/makefile.dos
+++ b/samples/toolbar/makefile.dos
@@ -1,87 +1,17 @@
 #
 # File:                makefile.dos
 # Author:      Julian Smart
-# Created:     1993
+# Created:     1998
 # Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
-# "%W% %G%"
-#
-# Makefile : Builds wxToolbar sample
+# Makefile : Builds 16-bit sample, VC++ 1.5
 # Use FINAL=1 argument to nmake to build final version with no debugging
 # info
 
-# Set WXDIR for your system
 WXDIR = $(WXWIN)
 
-!include $(WXDIR)\src\makemsc.env
-
-BBARDIR = $(WXDIR)\samples\toolbar
-
-INC = /I$(WXDIR)\include\base /I$(WXDIR)\include\msw
-
-THISDIR = $(BBARDIR)
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-# Default is to output RTF for WinHelp
-!ifndef WINHELP
-WINHELP=-winhelp
-!endif
-
-# Set this to nothing if using MS C++ 7
-ZOPTION=/Z7
-
-!if "$(FINAL)" == "0"
-CPPFLAGS=/AL /Gt8 /W3 /Zi $(ZOPTION) /G2sw /Od /YuWX_PREC.H $(INC) /Dwx_msw /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS=/AL /Gt8 /W3 /Zi $(ZOPTION) /G2sw /Od $(INC) /Dwx_msw
-LINKFLAGS=/NOD /CO /SEG:512 /ONERROR:NOEXE
-!else
-CPPFLAGS=/AL /Gt8 /W3 /G2sw /Os /YuWX_PREC.H $(INC) /Dwx_msw /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS=/AL /Gt8 /W3 /Zi $(ZOPTION) /G2sw /Od $(INC) /Dwx_msw
-LINKFLAGS=/NOD /SEG:512 /ONERROR:NOEXE
-!endif
-
-OBJECTS = test.obj
-
-all:    test.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)
-
-test.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) test.obj test.def test.res
-        link $(LINKFLAGS) @<<
-$(WXDIR)\src\msw\dummy.obj test.obj,
-test,
-NUL,
-$(LIBS),
-test.def
-;
-<<
-        rc -30 -K test.res
-
-test.obj:      test.h test.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
-<<
-
-test.res :      test.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /dFAFA_LIB /i$(WXDIR)\contrib\fafa /i$(WXDIR)\include\msw test
+TARGET=toolbar
+OBJECTS = $(TARGET).obj
 
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb
+!include $(WXDIR)\src\makeprog.msc