compilation fixes

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

diff --git a/src/png/makefile.bcc b/src/png/makefile.bcc
index efd3c07795a722d4cdfc8d4a60d810ac83bab9e3..e9e63e30518c2f68be00bb87fd5e1dc8f6f9a5b0 100644 (file)
--- a/src/png/makefile.bcc
+++ b/src/png/makefile.bcc
@@ -1,107 +1,92 @@
-# This file is special for Widows because setjmp 
-# is incompatible with the DOS version.
-# Alejandro Aguilar, 1995
-
-#
-# Borland C++ tools
-#
-IMPLIB  = Implib
-BCC     = Bcc +BccW16.cfg
-TLINK   = TLink
-TLIB    = TLib
-BRC     = Brc
-TASM    = Tasm
-
-

 #
 #

-# Options
-#   
-IDE_LFLAGS =  -LC:\BC4\LIB
-IDE_RFLAGS =  -IC:\BC4\INCLUDE;..\zlib;
-LLATW16_winpngdlib =  -Twe
-RLATW16_winpngdlib =  -31
-BLATW16_winpngdlib = 
-LEAT_winpngdlib = $(LLATW16_winpngdlib)
-REAT_winpngdlib = $(RLATW16_winpngdlib)
-BEAT_winpngdlib = $(BLATW16_winpngdlib)
-ZLIB=..\..\lib\zlib.lib
-LOBJECTS = png.obj pngrcb.obj pngread.obj pngrtran.obj pngrutil.obj pngstub.obj\
-       pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj
-
+# File:                makefile.bcc
+# Author:      Julian Smart
+# Created:     1993
+# Updated:     
+# Copyright:

 #
 #

-# Dependency List
+# "%W% %G%"

 #
 #

-Dep_winpng = \
-       ..\..\lib\winpng.lib
-
-winpng : BccW16.cfg $(Dep_winpng)
-  echo MakeNode winpng
-
-Dep_winpngdlib = \
-       png.obj\
-       pngrcb.obj\
-       pngread.obj\
-       pngrtran.obj\
-       pngrutil.obj\
-       pngstub.obj\
-       pngtrans.obj\
-       pngwrite.obj\
-       pngwtran.obj\
-       pngwutil.obj
-
-$(ZLIB): 
-       cd ..\zlib
-       make -fmakefile.bcc
-       cd ..\png
-       
-winpng.lib : $(Dep_winpngdlib) $(ZLIB)  
-  copy /b $(ZLIB) winpng.lib
-  $(TLIB) $< $(IDE_BFLAGS) $(BEAT_winpngdlib) @&&|    
-+$(LOBJECTS:.obj =.obj +)
-|
-
-png.obj :  png.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ png.c
-
-pngrcb.obj :  pngrcb.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngrcb.c
-
-pngread.obj :  pngread.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngread.c
-
-pngrtran.obj :  pngrtran.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngrtran.c
-
-pngrutil.obj :  pngrutil.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngrutil.c
-
-pngstub.obj :  pngstub.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngstub.c
-
-pngtrans.obj :  pngtrans.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngtrans.c
-
-pngwrite.obj :  pngwrite.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngwrite.c
-
-pngwtran.obj :  pngwtran.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngwtran.c
-
-pngwutil.obj :  pngwutil.c
-  $(BCC)   -P- -c $(CEAT_winpngdlib) -o$@ pngwutil.c
-
-# Compiler configuration file
-BccW16.cfg :
-       Copy &&|
--v
--vi
--X-
--H
--IC:\BC4\INCLUDE
--H=winpng.csm
+# Makefile : Builds PNG library (BC++ 16-bit) 
+
+# WXWIN and BCCDIR are set by parent make
+
+WXDIR = $(WXWIN)
+!include $(WXDIR)\src\makebcc.env
+
+WINPNGLIB = ..\..\lib\winpng.lib
+
+WXLIBDIR = $(WXDIR)\lib
+WXINC = $(WXDIR)\include\msw
+WXLIB = $(WXLIBDIR)\wx.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:
+       bcc $(CPPFLAGS) -c {$< }
+
+.c.obj:
+       bcc $(CPPFLAGS) -P- -c {$< }
+
+$(CFG): makefile.bcc
+       copy &&!
+-H=$(WXDIR)\src\msw\borland.pch
+-2
+-P
+-d
+-w-hid
+-w-par
+-w-pia
+-w-aus
+-w-rch

 -ml
 -ml

--WS
--3
--Ff
-| $@
+-Od
+-WE
+-Fs-
+-Vf
+-Ff=4
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
+-I$(WXDIR)\include\wx\msw\gnuwin32
+-L$(BCCDIR)\lib
+-D__WXWIN__
+-D__WXMSW__
+-D__WINDOWS__
+-D__WIN16__
+! $(CFG)
+!if "$(BOR_VER)" == "3.1"
+       echo -Ff=4 >>$(CFG)
+!elif "$(BOR_VER)" == "4"
+       echo -Ff=512 >>$(CFG)
+       echo -dc >>$(CFG)
+!else
+       echo -Ff=512 >>$(CFG)
+       echo -dc >>$(CFG)
+!endif
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws
+        -erase $(WINPNGLIB)