Use system default font for all platforms

[wxWidgets.git] / src / png / makefile.vc

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index 9094b9ee13f4fefc0901858254a002c229e55762..94244472b839d2b3b617d450424ada06e04c91e0 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -2,7 +2,7 @@
 # File:                makefile.vc
 # Author:      Julian Smart
 # Created:     1993
-# Updated:     
+# Updated:
 # Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"
@@ -11,12 +11,15 @@
 
 # Change WXDIR or WXWIN to wherever wxWindows is found
 WXDIR = $(WXWIN)
-WXLIB = $(WXDIR)\lib\wx.lib
-WXINC = $(WXDIR)\include
 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)
-WINPNGLIB = ..\..\lib\winpng.lib
+
+!if "$(FINAL)" == "1"
+WINPNGLIB=..\..\lib\png.lib
+!else
+WINPNGLIB=..\..\lib\pngd.lib
+!endif
 
 INC = /I..\zlib
 
@@ -27,21 +30,28 @@ ZOPTION=
 FINAL=0
 !endif
 
-PRECOMP=/YuWX.H 
+PRECOMP=/YuWX.H
 
 !if "$(FINAL)" == "0"
 OPT = /Od
-CPPFLAGS= /W4 /Zi /MD /GX $(ZOPTION) $(OPT) /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /W4 /Zi /MD /GX /Od /Dwx_msw $(INC)
+CPPFLAGS= /W4 /Zi $(CRTFLAG) /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
+CFLAGS= /W4 /Zi $(CRTFLAG) /GX /Od /D__WXMSW__ $(INC)
 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
+_CRTFLAG=/MDd
 !else
 # /Ox for real FINAL version
 OPT = /O2
-CPPFLAGS= /W4 /MD /GX /Dwx_msw $(INC) # $(PRECOMP) /Fp$(WXDIR)\src\msw\wx.pch
-CFLAGS= /W4 /MD /GX /Dwx_msw $(INC)
+CPPFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
+CFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
 LINKFLAGS=/NOD /ONERROR:NOEXE
+_CRTFLAG=/MDd
 !endif
 
+!if "$(CRTFLAG)" == ""
+CRTFLAG=$(_CRTFLAG)
+!endif
+
+
 OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
  pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
  pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj
@@ -49,7 +59,7 @@ OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
 all:    $(WINPNGLIB)
 
 $(WINPNGLIB):      $(OBJECTS)
-        erase $(WINPNGLIB)
+        -del $(WINPNGLIB)
         lib @<<
 -out:$(WINPNGLIB)
 $(OBJECTS)
@@ -59,8 +69,8 @@ $(OBJECTS)
   cl -DWIN32 $(OPT) $(CFLAGS) /c $*.c
 
 clean:
-        erase *.obj
-        erase *.exe
-        erase *.lib
+        -erase *.obj
+        -erase *.exe
+        -erase *.lib
 
 cleanall:      clean