changeset 6632:96bd7ecf0e1b

6988213: lcms build failure on windows-amd64 Reviewed-by: igor, prr
author bae
date Sat, 02 Oct 2010 12:41:20 +0400
parents 8bb1126f01d3
children 824e11bd7035 a0fd2f4b2197
files jdk/make/sun/cmm/lcms/Makefile
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/sun/cmm/lcms/Makefile	Wed Sep 29 10:44:02 2010 +0400
+++ b/jdk/make/sun/cmm/lcms/Makefile	Sat Oct 02 12:41:20 2010 +0400
@@ -80,7 +80,12 @@
 vpath %.c   $(SHARE_SRC)/native/sun/java2d
 
 ifeq ($(PLATFORM), windows)
-OTHER_CFLAGS += -DCMS_IS_WINDOWS_ -Dsqrtf=sqrt
+OTHER_CFLAGS += -DCMS_IS_WINDOWS_
+
+ifeq ($(COMPILER_VERSION), VS2003)
+OTHER_CFLAGS += -Dsqrtf=sqrt
+endif
+
 OTHER_LDLIBS = $(OBJDIR)/../../../sun.awt/awt/$(OBJDIRNAME)/awt.lib
 OTHER_INCLUDES += -I$(SHARE_SRC)/native/sun/java2d \
                   -I$(SHARE_SRC)/native/sun/awt/debug