Corrected points to pixels calculation

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

diff --git a/samples/printing/makefile.dos b/samples/printing/makefile.dos
index 7269a3224237e11ae744e148e38e7baa81f0c768..14946d6b93afbe0b836a80923d42cab77a10ba37 100644 (file)
--- a/samples/printing/makefile.dos
+++ b/samples/printing/makefile.dos
@@ -1,88 +1,17 @@
 #
 # File:                makefile.dos
 # Author:      Julian Smart
 #
 # File:                makefile.dos
 # Author:      Julian Smart

-# Created:     1993
+# Created:     1998

 # Updated:     
 # Updated:     

-# Copyright:   (c) 1993, AIAI, University of Edinburgh

 #
 #

-# "%W% %G%"
-#
-# Makefile : Builds printing example (DOS).
+# Makefile : Builds 16-bit sample, VC++ 1.5

 # Use FINAL=1 argument to nmake to build final version with no debugging
 # Use FINAL=1 argument to nmake to build final version with no debugging

-# info.
+# info

 
 

-# Set WXDIR for your system

 WXDIR = $(WXWIN)
 
 WXDIR = $(WXWIN)
 

-!include $(WXDIR)\src\makemsc.env
-
-THISDIR = $(WXDIR)\samples\printing
-WXLIB = $(WXDIR)\lib\wx.lib
-LIBS=$(WXLIB) oldnames libw llibcew commdlg ddeml shell mmsystem
-INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
-DUMMY=$(WXDIR)\src\msw\dummy.obj
-
-# Set this to nothing if using MS C++ 7
-ZOPTION=/Z7
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-DEBUGFLAG=#/DDEBUG=1
-
-!if "$(FINAL)" == "0"
-CPPFLAGS=/AL /W3 /Zi $(ZOPTION) /G2sw /Od $(INC) $(DEBUGFLAG) /YuWX_PREC.H /Dwx_msw /Fp$(WXDIR)\src\msw\wx.pch
-LINKFLAGS=/NOD /NOE /CO /ONERROR:NOEXE /SEG:256
-!else
-CPPFLAGS=/AL /W3 /G2sw $(INC) /Ox /YuWX_PREC.H /Dwx_msw /Fp$(WXDIR)\src\msw\wx.pch
-LINKFLAGS=/NOD /ONERROR:NOEXE /SEG:256
-!endif
-
-HEADERS = printing.h
-SOURCES = printing.$(SRCSUFF)
-OBJECTS = printing.obj
-
-printing:    printing.exe
-
-all:    wx printing.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)
-
-
-printing.exe:      $(DUMMY) $(WXLIB) printing.obj printing.def printing.res
-        link $(LINKFLAGS) @<<
-$(DUMMY) printing.obj,
-printing,
-NUL,
-$(LIBS),
-printing.def
-;
-<<
-        rc -31 -K printing.res
-
-printing.obj:      printing.h printing.$(SRCSUFF) $(DUMMY) $(WXDIR)\include\base\wx_print.h
-        cl @<<
-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
-<<
-
-printing.res :      printing.rc $(WXDIR)\include\msw\wx.rc
-    rc -r /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa printing
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb
+TARGET=printing
+OBJECTS=$(TARGET).obj

 
 

+!include $(WXDIR)\src\makeprog.msc