fixes for page positioning for notebooks with wxNB_MULTILINE style (closes bugs 70909...

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

diff --git a/src/jpeg/makefile.wat b/src/jpeg/makefile.wat
index 3081493a7a33906b9929195eb24951a50a814930..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
 


@@ -17,58 +18,58 @@ LIBTARGET = $(WXLIB)\jpeg$(WATCOM_SUFFIX).lib
 
 # library object files common to compression and decompression
 COMOBJECTS = &
 
 # library object files common to compression and decompression
 COMOBJECTS = &

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

 
 # compression library object files
 CLIBOBJECTS = &
 
 # compression library object files
 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
+    $(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
 DLIBOBJECTS = &
 
 # decompression library object files
 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
+    $(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
 OBJECTS = $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
 
 # These objectfiles are included in libjpeg.lib
 OBJECTS = $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)


@@ -78,18 +79,18 @@ all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
 $(OUTPUTDIR):
        @if not exist $^@ mkdir $^@
 
 $(OUTPUTDIR):
        @if not exist $^@ mkdir $^@
 

-LBCFILE=$(OUTPUTDIR)jpeg.lbc
+LBCFILE=$(OUTPUTDIR)\jpeg.lbc

 $(LIBTARGET) : $(OBJECTS)
     %create $(LBCFILE)
     @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
     wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
 
 clean: .SYMBOLIC
 $(LIBTARGET) : $(OBJECTS)
     %create $(LBCFILE)
     @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
     wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
 
 clean: .SYMBOLIC

-    -erase $(OUTPUTDIR)*.obj
+    -erase $(OUTPUTDIR)\*.obj

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

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

 
 cleanall:   clean
 
 
 cleanall:   clean