harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r749338 - in /harmony/enhanced/classlib/trunk/modules/imageio/src/main/native: jpegencoder/unix/makefile pngencoder/unix/makefile
Date Mon, 02 Mar 2009 15:40:25 GMT
Author: odeakin
Date: Mon Mar  2 15:40:24 2009
New Revision: 749338

URL: http://svn.apache.org/viewvc?rev=749338&view=rev
Log:
Changes to enable imageio to build on z/OS - need locally built png and jpeg libraries as
they are not readily available.

Modified:
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile?rev=749338&r1=749337&r2=749338&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
Mon Mar  2 15:40:24 2009
@@ -19,7 +19,11 @@
 
 BUILDFILES = $(SHAREDSUB)JpegEncoder.o
 
+ifneq ($(HY_OS),zos)
 OSLIBS += -ljpeg
+else
+MDLLIBFILES += $(LIBPATH)libjpeg.a
+endif
 
 ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=749338&r1=749337&r2=749338&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
Mon Mar  2 15:40:24 2009
@@ -19,7 +19,12 @@
 
 BUILDFILES = $(SHAREDSUB)pngencoder.o
 
+ifneq ($(HY_OS),zos)
 OSLIBS += -lpng
+else
+MDLLIBFILES += $(LIBPATH)libpng.a
+DEFINES += -DPNGAPI=
+endif
 
 ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a $(MDLLIBZLIB)



Mime
View raw message