Fix compilation errors under OSX.

[wxWidgets.git] / src / png / scripts / makefile.bor

diff --git a/src/png/scripts/makefile.bor b/src/png/scripts/makefile.bor
index a5651aa3f8f7c154f3e20d8fc7d54ad4bcb3f103..dcc3c633c0a445ac3452794382811c4b2d4e21ff 100644 (file)
--- a/src/png/scripts/makefile.bor
+++ b/src/png/scripts/makefile.bor
@@ -12,7 +12,6 @@
 ## Where zlib.h, zconf.h and zlib_MODEL.lib are
 ZLIB_DIR=..\zlib
 
 ## Where zlib.h, zconf.h and zlib_MODEL.lib are
 ZLIB_DIR=..\zlib
 

-

 ## Compiler, linker and lib stuff
 CC=bcc
 LD=bcc
 ## Compiler, linker and lib stuff
 CC=bcc
 LD=bcc


@@ -57,8 +56,8 @@ CFLAGS=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG)
 # -M  generate map file
 LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG)
 
 # -M  generate map file
 LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG)
 

-

 ## Variables
 ## Variables

+

 OBJS = \
        png.obj \
        pngerror.obj \
 OBJS = \
        png.obj \
        pngerror.obj \


@@ -95,8 +94,8 @@ LIBOBJS = \
 
 LIBNAME=libpng$(MODEL).lib
 
 
 LIBNAME=libpng$(MODEL).lib
 

-

 ## Implicit rules
 ## Implicit rules

+

 # Braces let make "batch" calls to the compiler,
 # 2 calls instead of 12; space is important.
 .c.obj:
 # Braces let make "batch" calls to the compiler,
 # 2 calls instead of 12; space is important.
 .c.obj:


@@ -105,8 +104,8 @@ LIBNAME=libpng$(MODEL).lib
 .c.exe:
        $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)
 
 .c.exe:
        $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)
 

-

 ## Major targets
 ## Major targets

+

 all: libpng pngtest
 
 libpng: $(LIBNAME)
 all: libpng pngtest
 
 libpng: $(LIBNAME)


@@ -116,25 +115,23 @@ pngtest: pngtest$(MODEL).exe
 test: pngtest$(MODEL).exe
        pngtest$(MODEL)
 
 test: pngtest$(MODEL).exe
        pngtest$(MODEL)
 

-

 ## Minor Targets
 
 ## Minor Targets
 

-png.obj: png.c
-pngerror.obj: pngerror.c
-pngget.obj: pngget.c
-pngmem.obj: pngmem.c
-pngpread.obj: pngpread.c
-pngread.obj: pngread.c
-pngrio.obj: pngrio.c
-pngrtran.obj: pngrtran.c
-pngrutil.obj: pngrutil.c
-pngset.obj: pngset.c
-pngtrans.obj: pngtrans.c
-pngwio.obj: pngwio.c
-pngwrite.obj: pngwrite.c
-pngwtran.obj: pngwtran.c
-pngwutil.obj: pngwutil.c
-
+png.obj: png.c png.h pngconf.h pngpriv.h
+pngerror.obj: pngerror.c png.h pngconf.h pngpriv.h
+pngget.obj: pngget.c png.h pngconf.h pngpriv.h
+pngmem.obj: pngmem.c png.h pngconf.h pngpriv.h
+pngpread.obj: pngpread.c png.h pngconf.h pngpriv.h
+pngread.obj: pngread.c png.h pngconf.h pngpriv.h
+pngrio.obj: pngrio.c png.h pngconf.h pngpriv.h
+pngrtran.obj: pngrtran.c png.h pngconf.h pngpriv.h
+pngrutil.obj: pngrutil.c png.h pngconf.h pngpriv.h
+pngset.obj: pngset.c png.h pngconf.h pngpriv.h
+pngtrans.obj: pngtrans.c png.h pngconf.h pngpriv.h
+pngwio.obj: pngwio.c png.h pngconf.h pngpriv.h
+pngwrite.obj: pngwrite.c png.h pngconf.h pngpriv.h
+pngwtran.obj: pngwtran.c png.h pngconf.h pngpriv.h
+pngwutil.obj: pngwutil.c png.h pngconf.h pngpriv.h

 
 $(LIBNAME): $(OBJS)
        -del $(LIBNAME)
 
 $(LIBNAME): $(OBJS)
        -del $(LIBNAME)


@@ -142,14 +139,12 @@ $(LIBNAME): $(OBJS)
 $(LIBOBJS), libpng$(MODEL)
 |
 
 $(LIBOBJS), libpng$(MODEL)
 |
 

-
-pngtest$(MODEL).obj: pngtest.c
+pngtest$(MODEL).obj: pngtest.c png.h pngconf.h

        $(CC) $(CFLAGS) -opngtest$(MODEL) -c pngtest.c
 
 pngtest$(MODEL).exe: pngtest$(MODEL).obj
        $(LD) $(LDFLAGS) pngtest$(MODEL).obj $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)
 
        $(CC) $(CFLAGS) -opngtest$(MODEL) -c pngtest.c
 
 pngtest$(MODEL).exe: pngtest$(MODEL).obj
        $(LD) $(LDFLAGS) pngtest$(MODEL).obj $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB)
 

-

 # Clean up anything else you want
 clean:
        -del *.obj
 # Clean up anything else you want
 clean:
        -del *.obj


@@ -158,5 +153,4 @@ clean:
        -del *.lst
        -del *.map
 
        -del *.lst
        -del *.map
 

-

 # End of makefile for libpng
 # End of makefile for libpng