more warning fixes

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

diff --git a/src/png/makefile.b32 b/src/png/makefile.b32
index 0425a7f2fb5c136bf3936d571c77958b87827ce5..aeb245d29a8f4905278880a95e2ab715c5a39559 100644 (file)
--- a/src/png/makefile.b32
+++ b/src/png/makefile.b32
@@ -2,7 +2,7 @@
 # File:                makefile.b32
 # Author:      Julian Smart
 # Created:     1993
-# Updated:     
+# Updated:
 # Copyright:
 #
 # "%W% %G%"
@@ -11,72 +11,61 @@
 
 # WXWIN and BCCDIR are set by parent make
 
-WXDIR = $(WXWIN)
-!include $(WXDIR)\src\makeb32.env
-
-WINPNGLIB = ..\..\lib\winpng.lib
-
-WXLIBDIR = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXLIB = $(WXLIBDIR)\wx32.lib 
-
-!if "$(FINAL)" == "0"
-OPT = -Od
-DEBUG_FLAGS= -v
-!else
-OPT = -Od
-DEBUG_FLAGS =
-!endif
-CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
-
-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
-
-all: $(WINPNGLIB)
-
-$(WINPNGLIB): $(OBJECTS) 
-        -erase $(WINPNGLIB)
-       tlib $(WINPNGLIB) /P512 @&&!
--+$(OBJECTS:.obj =.obj -+) 
-!
-
-.$(SRCSUFF).obj:
-       bcc32 $(CPPFLAGS) -c {$< }
-
-.c.obj:
-       bcc32 $(CPPFLAGS) -P- -c {$< }
-
-$(CFG): makefile.b32
-       copy &&!
--3
--P
--d
--w-hid
--w-par
--w-pia
--w-aus
--w-rch
--Oxt
--WE
-
--I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
--I$(WXDIR)\include\wx\msw\gnuwin32
-
--L$(BCCDIR)\lib
--D__WXWIN__
--D__WXMSW__
--D__WINDOWS__
--DWIN32
-$(OPT)
-$(DEBUG_FLAGS)
-$(WIN95FLAG)
-! $(CFG)
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.rws
 
+WXWIN=..\..
+LIBTARGET=png
+
+!include ..\makeb32.env
+
+OBJECTS = $(OBJ_PATH)\png.obj \
+       $(OBJ_PATH)\pngread.obj \
+       $(OBJ_PATH)\pngrtran.obj \
+       $(OBJ_PATH)\pngrutil.obj \
+       $(OBJ_PATH)\pngpread.obj \
+       $(OBJ_PATH)\pngtrans.obj \
+       $(OBJ_PATH)\pngwrite.obj \
+       $(OBJ_PATH)\pngwtran.obj \
+       $(OBJ_PATH)\pngwutil.obj \
+       $(OBJ_PATH)\pngerror.obj \
+       $(OBJ_PATH)\pngmem.obj \
+       $(OBJ_PATH)\pngwio.obj \
+       $(OBJ_PATH)\pngrio.obj \
+       $(OBJ_PATH)\pngget.obj \
+       $(OBJ_PATH)\pngset.obj
+
+# Precompiled headers seem to interfere with correct compilation
+# of png library, so switch them off
+EXTRACPPFLAGS=-H-
+
+
+$(OBJ_PATH)\png.obj: png.c
+
+$(OBJ_PATH)\pngread.obj: pngread.c
+
+$(OBJ_PATH)\pngrtran.obj: pngrtran.c
+
+$(OBJ_PATH)\pngrutil.obj: pngrutil.c
+
+$(OBJ_PATH)\pngpread.obj: pngpread.c
+
+$(OBJ_PATH)\pngtrans.obj: pngtrans.c
+
+$(OBJ_PATH)\pngwrite.obj: pngwrite.c
+
+$(OBJ_PATH)\pngwtran.obj: pngwtran.c
+
+$(OBJ_PATH)\pngwutil.obj: pngwutil.c
+
+$(OBJ_PATH)\pngerror.obj: pngerror.c
+
+$(OBJ_PATH)\pngmem.obj: pngmem.c
+
+$(OBJ_PATH)\pngwio.obj: pngwio.c
+
+$(OBJ_PATH)\pngrio.obj: pngrio.c
+
+$(OBJ_PATH)\pngget.obj: pngget.c
+
+$(OBJ_PATH)\pngset.obj: pngset.c
+
+!include ..\makelib.b32