Removed workaround for a (now fixed) wxMotif problem.

[wxWidgets.git] / src / zlib / makefile.wat

diff --git a/src/zlib/makefile.wat b/src/zlib/makefile.wat
index e8ee232db440486835005d78aacdff56aa47c804..f6fbce4436be4585106a61332705664584a3e500 100644 (file)
--- a/src/zlib/makefile.wat
+++ b/src/zlib/makefile.wat
@@ -1,105 +1,53 @@
-# Makefile for zlib
-# Watcom 10a
+##############################################################################
+# Name:                        src/zlib/makefile.wat
+# Purpose:             build zlib using Watcom 11.0+ compiler
+# Author:              Vadim Zeitlin
+# Created:             21.01.03
+# RCS-ID:              $Id$
+# Copyright:           (c) 2003 Vadim Zeitlin
+# Changelist:          2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
+# Licence:             wxWindows licence
+##############################################################################
 
-# This version of the zlib makefile was adapted by Chris Young for use
-# with Watcom 10a 32-bit protected mode flat memory model.  It was created 
-# for use with POV-Ray ray tracer and you may choose to edit the CFLAGS to 
-# suit your needs but the -DMSDOS is required.
-# -- Chris Young 76702.1655@compuserve.com
+WXDIR = ..\..
+OUTPUTDIR=watcom
 
-# To use, do "wmake -f makefile.wat"
+!include $(WXDIR)\src\makewat.env
 
-# See zconf.h for details about the memory requirements.
-
-# ------------- Watcom 10a -------------
-MODEL=-mf 
-CFLAGS= $(MODEL) -fpi87 -fp5 -zp4 -5r -w5 -oneatx -DMSDOS
-CC=wcc386
-LD=wcl386
-LIB=wlib -b -c 
-LDFLAGS= 
-O=.obj
-LIBTARGET=..\..\lib\zlib.lib
+LIBTARGET=$(WXDIR)\lib\zlib$(WATCOM_SUFFIX).lib
 
 # variables
-OBJ1=adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) 
-OBJ2=trees$(O) zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) 
-OBJ3=infutil$(O) inffast$(O)
-OBJP1=adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)
-OBJP2=trees$(O)+zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)
-OBJP3=infutil$(O)+inffast$(O)
-
-all: test
-
-adler32.obj: adler32.c zutil.h zlib.h zconf.h
-       $(CC) $(CFLAGS) $*.c
-
-compress.obj: compress.c zlib.h zconf.h
-       $(CC) $(CFLAGS) $*.c
-
-crc32.obj: crc32.c zutil.h zlib.h zconf.h
-       $(CC) $(CFLAGS) $*.c
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-       $(CC) $(CFLAGS) $*.c
-
-gzio.obj: gzio.c zutil.h zlib.h zconf.h
-       $(CC) $(CFLAGS) $*.c
-
-infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h &
-  infcodes.h infutil.h
-       $(CC) $(CFLAGS) $*.c
-
-infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h &
-  infcodes.h inffast.h
-       $(CC) $(CFLAGS) $*.c
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
-       $(CC) $(CFLAGS) $*.c
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-       $(CC) $(CFLAGS) $*.c
-
-infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
-       $(CC) $(CFLAGS) $*.c
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
-       $(CC) $(CFLAGS) $*.c
-
-trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
-       $(CC) $(CFLAGS) $*.c
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-       $(CC) $(CFLAGS) $*.c
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-       $(CC) $(CFLAGS) $*.c
-
-example.obj: example.c zlib.h zconf.h
-       $(CC) $(CFLAGS) $*.c
-
-minigzip.obj: minigzip.c zlib.h zconf.h
-       $(CC) $(CFLAGS) $*.c
-
-# we must cut the command line to fit in the MS/DOS 128 byte limit:
-$(LIBTARGET): $(OBJ1) $(OBJ2) $(OBJ3) 
-       del $(LIBTARGET)
-       $(LIB) $(LIBTARGET) +$(OBJP1)
-       $(LIB) $(LIBTARGET) +$(OBJP2)
-       $(LIB) $(LIBTARGET) +$(OBJP3)
-
-example.exe: example.obj $(LIBTARGET)
-       $(LD) $(LDFLAGS) example.obj $(LIBTARGET)
-
-minigzip.exe: minigzip.obj $(LIBTARGET)
-       $(LD) $(LDFLAGS) minigzip.obj $(LIBTARGET)
-
-test: minigzip.exe example.exe
-       example
-       echo hello world | minigzip | minigzip -d >test
-       type test
-
-clean:
+OBJECTS = &
+       $(OUTPUTDIR)\adler32.obj &
+       $(OUTPUTDIR)\compress.obj &
+       $(OUTPUTDIR)\crc32.obj &
+       $(OUTPUTDIR)\gzio.obj &
+       $(OUTPUTDIR)\uncompr.obj &
+       $(OUTPUTDIR)\deflate.obj &
+       $(OUTPUTDIR)\trees.obj &
+       $(OUTPUTDIR)\zutil.obj &
+       $(OUTPUTDIR)\inflate.obj &
+       $(OUTPUTDIR)\infblock.obj &
+       $(OUTPUTDIR)\inftrees.obj &
+       $(OUTPUTDIR)\infcodes.obj &
+       $(OUTPUTDIR)\infutil.obj &
+       $(OUTPUTDIR)\inffast.obj
+
+# all: test
+
+all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
+
+$(OUTPUTDIR):
+       @if not exist $^@ mkdir $^@
+
+LBCFILE=$(OUTPUTDIR)\zlib.lbc
+$(LIBTARGET) : $(OBJECTS)
+       %create $(LBCFILE)
+       @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
+       wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
+
+clean: .SYMBOLIC
        -erase *.obj
        -erase *.exe
-        -erase $(LIBTARGET)
+       -erase $(LIBTARGET)
+