Instead of m_menuBar use GetMenuBar() which will be modified (with next patch)

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

diff --git a/src/jpeg/makefile.wat b/src/jpeg/makefile.wat
index d1f309c5b363d074f75853af2b62d8ba777576ad..88ed70b0c4949d095bd051162b3d277ae6e60c51 100644 (file)
--- a/src/jpeg/makefile.wat
+++ b/src/jpeg/makefile.wat
@@ -3,6 +3,7 @@
 # File:                makefile.wat
 # Author:      Julian Smart
 # Created:     1998
 # File:                makefile.wat
 # Author:      Julian Smart
 # Created:     1998

+# Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch

 #
 # Makefile : Builds JPEG library for Watcom C++, WIN32
 
 #
 # Makefile : Builds JPEG library for Watcom C++, WIN32
 


@@ -13,81 +14,83 @@ EXTRACPPFLAGS=-i=..\zlib
 
 WXLIB = $(WXDIR)\lib
 
 
 WXLIB = $(WXDIR)\lib
 

-LIBTARGET   = $(WXLIB)\jpeg.lib
+LIBTARGET = $(WXLIB)\jpeg$(WATCOM_SUFFIX).lib

 
 

-SYSDEPMEM= jmemnobs.obj
-
-# source files: JPEG library proper
-LIBSOURCES= jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c &
-        jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c &
-        jcphuff.c jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c &
-        jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c &
-        jdinput.c jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c &
-        jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c jfdctfst.c &
-        jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c &
-        jquant2.c jutils.c jmemmgr.c
-# memmgr back ends: compile only one of these into a working library
-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c
-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom
-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c &
-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c &
-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c
-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)
-# files included by source files
-INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h &
-        jpegint.h jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h
-# documentation, test, and support files
-DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 &
-        wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc &
-        coderules.doc filelist.doc change.log
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc &
-        makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds &
-        makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st &
-        maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms &
-        makvms.opt
-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat &
-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas &
-        jconfig.vms
-CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
-OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg &
-        testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) &
-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)

 # library object files common to compression and decompression
 # library object files common to compression and decompression

-COMOBJECTS= jcomapi.obj jutils.obj jerror.obj jmemmgr.obj $(SYSDEPMEM)
+COMOBJECTS = &
+    $(OUTPUTDIR)\jcomapi.obj &
+    $(OUTPUTDIR)\jutils.obj &
+    $(OUTPUTDIR)\jerror.obj &
+    $(OUTPUTDIR)\jmemmgr.obj &
+    $(OUTPUTDIR)\jmemnobs.obj
+

 # compression library object files
 # compression library object files

-CLIBOBJECTS= jcapimin.obj jcapistd.obj jctrans.obj jcparam.obj jdatadst.obj &
-        jcinit.obj jcmaster.obj jcmarker.obj jcmainct.obj jcprepct.obj &
-        jccoefct.obj jccolor.obj jcsample.obj jchuff.obj jcphuff.obj &
-        jcdctmgr.obj jfdctfst.obj jfdctflt.obj jfdctint.obj
+CLIBOBJECTS = &
+    $(OUTPUTDIR)\jcapimin.obj &
+    $(OUTPUTDIR)\jcapistd.obj &
+    $(OUTPUTDIR)\jctrans.obj &
+    $(OUTPUTDIR)\jcparam.obj &
+    $(OUTPUTDIR)\jdatadst.obj &
+    $(OUTPUTDIR)\jcinit.obj &
+    $(OUTPUTDIR)\jcmaster.obj &
+    $(OUTPUTDIR)\jcmarker.obj &
+    $(OUTPUTDIR)\jcmainct.obj &
+    $(OUTPUTDIR)\jcprepct.obj &
+    $(OUTPUTDIR)\jccoefct.obj &
+    $(OUTPUTDIR)\jccolor.obj &
+    $(OUTPUTDIR)\jcsample.obj &
+    $(OUTPUTDIR)\jchuff.obj &
+    $(OUTPUTDIR)\jcphuff.obj &
+    $(OUTPUTDIR)\jcdctmgr.obj &
+    $(OUTPUTDIR)\jfdctfst.obj &
+    $(OUTPUTDIR)\jfdctflt.obj &
+    $(OUTPUTDIR)\jfdctint.obj
+

 # decompression library object files
 # decompression library object files

-DLIBOBJECTS= jdapimin.obj jdapistd.obj jdtrans.obj jdatasrc.obj &
-        jdmaster.obj jdinput.obj jdmarker.obj jdhuff.obj jdphuff.obj &
-        jdmainct.obj jdcoefct.obj jdpostct.obj jddctmgr.obj jidctfst.obj &
-        jidctflt.obj jidctint.obj jidctred.obj jdsample.obj jdcolor.obj &
-        jquant1.obj jquant2.obj jdmerge.obj
+DLIBOBJECTS = &
+    $(OUTPUTDIR)\jdapimin.obj &
+    $(OUTPUTDIR)\jdapistd.obj &
+    $(OUTPUTDIR)\jdtrans.obj &
+    $(OUTPUTDIR)\jdatasrc.obj &
+    $(OUTPUTDIR)\jdmaster.obj &
+    $(OUTPUTDIR)\jdinput.obj &
+    $(OUTPUTDIR)\jdmarker.obj &
+    $(OUTPUTDIR)\jdhuff.obj &
+    $(OUTPUTDIR)\jdphuff.obj &
+    $(OUTPUTDIR)\jdmainct.obj &
+    $(OUTPUTDIR)\jdcoefct.obj &
+    $(OUTPUTDIR)\jdpostct.obj &
+    $(OUTPUTDIR)\jddctmgr.obj &
+    $(OUTPUTDIR)\jidctfst.obj &
+    $(OUTPUTDIR)\jidctflt.obj &
+    $(OUTPUTDIR)\jidctint.obj &
+    $(OUTPUTDIR)\jidctred.obj &
+    $(OUTPUTDIR)\jdsample.obj &
+    $(OUTPUTDIR)\jdcolor.obj &
+    $(OUTPUTDIR)\jquant1.obj &
+    $(OUTPUTDIR)\jquant2.obj &
+    $(OUTPUTDIR)\jdmerge.obj
+

 # These objectfiles are included in libjpeg.lib
 # These objectfiles are included in libjpeg.lib

-OBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
-# object files for sample applications (excluding library files)
-COBJECTS= cjpeg.obj rdppm.obj rdgif.obj rdtarga.obj rdrle.obj rdbmp.obj &
-        rdswitch.obj cdjpeg.obj
-DOBJECTS= djpeg.obj wrppm.obj wrgif.obj wrtarga.obj wrrle.obj wrbmp.obj &
-        rdcolmap.obj cdjpeg.obj
-TROBJECTS= jpegtran.obj rdswitch.obj cdjpeg.obj transupp.obj
-all:        $(OBJECTS) $(LIBTARGET)
+OBJECTS = $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
+
+all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
+
+$(OUTPUTDIR):
+       @if not exist $^@ mkdir $^@

 
 

+LBCFILE=$(OUTPUTDIR)\jpeg.lbc

 $(LIBTARGET) : $(OBJECTS)
 $(LIBTARGET) : $(OBJECTS)

-    %create tmp.lbc
-    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
-    wlib /b /c /n /p=512 $^@ @tmp.lbc
+    %create $(LBCFILE)
+    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
+    wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)

 
 

-clean:   .SYMBOLIC
-    -erase *.obj
+clean: .SYMBOLIC
+    -erase $(OUTPUTDIR)\*.obj

     -erase $(LIBTARGET)
     -erase $(LIBTARGET)

-    -erase *.pch
-    -erase *.err
-    -erase *.lbc
+    -erase $(OUTPUTDIR)\*.pch
+    -erase $(OUTPUTDIR)\*.err
+    -erase $(OUTPUTDIR)\*.lbc

 
 cleanall:   clean
 
 
 cleanall:   clean