fixed wxTaskBarIcon compilation

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

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index bd797dfff5783ecf702c2842d58b01bde9e3e557..b6dc8e43b0688a420836dc6def39c512fdd5c560 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -1,71 +1,31 @@
-#
-# File:                makefile.vc
-# Author:      Julian Smart
-# Created:     1993
-# Updated:
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds winpng.lib library for Windows 3.1
 
-# Change WXDIR or WXWIN to wherever wxWindows is found
-WXDIR = $(WXWIN)
-
-WINPNGDIR = ..\png
-WINPNGINC = $(WINPNGDIR)
-WINPNGLIB = ..\..\lib\winpng.lib
-
-INC = /I..\zlib
-
-# Set this to nothing if your compiler is MS C++ 7
-ZOPTION=
-
-!ifndef FINAL
-FINAL=0
-!endif
-
-PRECOMP=/YuWX.H
-
-!if "$(FINAL)" == "0"
-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
-_CRTFLAG=/MDd
+!if "$(FINAL)" == "1"
+LIBTARGET=$(WXDIR)\lib\png.lib
+!else if "$(FINAL)" == "hybrid"
+LIBTARGET=$(WXDIR)\lib\pngh.lib
 !else
-# /Ox for real FINAL version
-OPT = /O2
-CPPFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
-CFLAGS= /W4 $(CRTFLAG) /GX /D__WXMSW__ $(INC)
-LINKFLAGS=/NOD /ONERROR:NOEXE
-_CRTFLAG=/MDd
+LIBTARGET=$(WXDIR)\lib\pngd.lib
 !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 = $D\png.obj \
+          $D\pngread.obj \
+          $D\pngrtran.obj \
+          $D\pngrutil.obj \
+          $D\pngpread.obj \
+          $D\pngtrans.obj \
+          $D\pngwrite.obj \
+          $D\pngwtran.obj \
+          $D\pngwutil.obj \
+          $D\pngerror.obj \
+          $D\pngmem.obj \
+          $D\pngwio.obj \
+          $D\pngrio.obj \
+          $D\pngget.obj \
+          $D\pngset.obj
 
-all:    $(WINPNGLIB)
 
-$(WINPNGLIB):      $(OBJECTS)
-        -erase $(WINPNGLIB)
-        lib @<<
--out:$(WINPNGLIB)
-$(OBJECTS)
-<<
 
-.c.obj:
-  cl -DWIN32 $(OPT) $(CFLAGS) /c $*.c
+# Pull in standard variable definitions
 
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.lib
+!include ..\makelib.vc
 
-cleanall:      clean