regenerated

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

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index e028f53f0f5416868f28e76b7e2078657e37d7e5..cf5e9f3af6b681da6426ef3f5b03dbb5dfb07d79 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -2,7 +2,7 @@
 # File:                makefile.vc
 # Author:      Julian Smart
 # Created:     1993
 # File:                makefile.vc
 # Author:      Julian Smart
 # Created:     1993

-# Updated:     
+# Updated:

 # Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"
 # Copyright:   (c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"


@@ -14,7 +14,14 @@ WXDIR = $(WXWIN)
 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)
 
 WINPNGDIR = ..\png
 WINPNGINC = $(WINPNGDIR)

-WINPNGLIB = ..\..\lib\winpng.lib
+
+!if "$(FINAL)" == "1"
+WINPNGLIB=..\..\lib\png.lib
+!else if "$(FINAL)" == "hybrid"
+WINPNGLIB=..\..\lib\pngh.lib
+!else
+WINPNGLIB=..\..\lib\pngd.lib
+!endif

 
 INC = /I..\zlib
 
 
 INC = /I..\zlib
 


@@ -25,21 +32,34 @@ ZOPTION=
 FINAL=0
 !endif
 
 FINAL=0
 !endif
 

-PRECOMP=/YuWX.H 
+PRECOMP=/YuWX.H

 
 !if "$(FINAL)" == "0"
 OPT = /Od
 
 !if "$(FINAL)" == "0"
 OPT = /Od

-CPPFLAGS= /W4 /Zi /MDd /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
-CFLAGS= /W4 /Zi /MDd /GX /Od /D__WXMSW__ $(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 if "$(FINAL)" == "hybrid"
+OPT = /Od
+CPPFLAGS= /W4 /Zi $(CRTFLAG) /GX $(ZOPTION) $(OPT) /D__WXMSW__ $(INC)
+CFLAGS= /W4 /Zi $(CRTFLAG) /GX /Od /D__WXMSW__ $(INC)

 LINKFLAGS=/NOD /CO /ONERROR:NOEXE
 LINKFLAGS=/NOD /CO /ONERROR:NOEXE

+_CRTFLAG=/MD

 !else
 # /Ox for real FINAL version
 OPT = /O2
 !else
 # /Ox for real FINAL version
 OPT = /O2

-CPPFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC)
-CFLAGS= /W4 /MD /GX /D__WXMSW__ $(INC)
+CPPFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
+CFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)

 LINKFLAGS=/NOD /ONERROR:NOEXE
 LINKFLAGS=/NOD /ONERROR:NOEXE

+_CRTFLAG=/MD

 !endif
 
 !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
 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


@@ -59,6 +79,6 @@ $(OBJECTS)
 clean:
         -erase *.obj
         -erase *.exe
 clean:
         -erase *.obj
         -erase *.exe

-        -erase *.lib
+        -erase $(WINPNGLIB)

 
 cleanall:      clean
 
 cleanall:      clean