fixes for new lib dirs for wxMSW

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

diff --git a/samples/validate/makefile.dos b/samples/validate/makefile.dos
index 5b65a93c365534ac8bb2f3f740fa8cb35933820a..8aa42c38e7197107797167767eaa6ab48cbf8497 100644 (file)
--- a/samples/validate/makefile.dos
+++ b/samples/validate/makefile.dos
@@ -1,81 +1,10 @@
-#
-# File:                makefile.dos
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds minimal example (DOS).
-# Use FINAL=1 argument to nmake to build final version with no debugging
-# info
+# Purpose: makefile for validate example (VC++ 1.5x)
+# Created: 2000-03-14
 
 WXDIR = $(WXWIN)
 
-!include $(WXDIR)\src\makemsc.env
+TARGET=validate
+OBJECTS=$(TARGET).obj
 
-THISDIR = $(WXDIR)\samples\minimal
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) oldnames libw llibcew commdlg shell ddeml
+!include $(WXDIR)\src\makeprog.msc
 
-!ifndef FINAL
-FINAL=0
-!endif
-
-INC=/I$(WXDIR)\include\msw /I$(WXDIR)\include\base
-
-# Set this to nothing if using MS C++ 7
-ZOPTION=/Z7
-
-!if "$(FINAL)" == "0"
-CPPFLAGS=/AL /W3 /Zi $(ZOPTION) /G2sw /Od /YuWX_PREC.H /Dwx_msw /Fp$(WXDIR)\src\msw\wx.pch $(INC)
-LINKFLAGS=/NOD /CO /ONERROR:NOEXE /SEG:512
-!else
-CPPFLAGS=/AL /W3 /G2sw /Ox /YuWX_PREC.H /Dwx_msw /Fp$(WXDIR)\src\msw\wx.pch $(INC)
-LINKFLAGS=/NOD /ONERROR:NOEXE /SEG:512
-!endif
-
-HEADERS =
-SOURCES = minimal.$(SRCSUFF)
-OBJECTS = minimal.obj
-
-all:    minimal.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)
-
-
-minimal.exe:      $(WXDIR)\src\msw\dummy.obj $(WXLIB) minimal.obj minimal.def minimal.res
-        link $(LINKFLAGS) @<<
-minimal.obj $(WXDIR)\src\msw\dummy.obj,
-minimal,
-NUL,
-$(LIBS),
-minimal.def
-;
-<<
-        rc -30 -K minimal.res
-
-minimal.obj:      minimal.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
-<<
-
-minimal.res :      minimal.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /dFAFA_LIB /i$(WXDIR)\contrib\fafa /i$(WXDIR)\include\msw minimal
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb