changeset 124:ea864b169286

6613927: Compilation of splashscreen png library failed on Ubuntu 7.04 (64bit) Summary: The macro PNG_NO_MMX_CODE should be defined when compiling on 64bit Linux Reviewed-by: yan, avu
author anthony
date Tue, 18 Mar 2008 13:53:08 +0300
parents 96a10460ed63
children 079ae88eaea9
files jdk/make/sun/splashscreen/Makefile
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/sun/splashscreen/Makefile	Tue Mar 18 12:04:20 2008 +0300
+++ b/jdk/make/sun/splashscreen/Makefile	Tue Mar 18 13:53:08 2008 +0300
@@ -85,3 +85,13 @@
 CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
 
+ifeq ($(PLATFORM), linux)
+  ifeq ($(ARCH_DATA_MODEL), 64)
+    # 64-bit gcc has problems compiling MMX instructions.
+    # Google it for more details. Possibly the newer versions of
+    # the PNG-library and/or the new compiler will not need this
+    # option in the future.
+    CPPFLAGS += -DPNG_NO_MMX_CODE
+  endif
+endif
+