Mercurial > hg > openjdk > jigsaw > jdk
changeset 7337:747a09471fd9
8011812: JDK-8011278 breaks the old build
Reviewed-by: tbell, wetmore
| author | erikj |
|---|---|
| date | Thu, 11 Apr 2013 14:47:54 -0700 |
| parents | a6ca7cd399b2 |
| children | 793e0072bfd6 d8d037a7569e |
| files | make/sun/splashscreen/Makefile |
| diffstat | 1 files changed, 6 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/make/sun/splashscreen/Makefile Thu Apr 11 18:00:23 2013 +0100 +++ b/make/sun/splashscreen/Makefile Thu Apr 11 14:47:54 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -83,21 +83,17 @@ -framework JavaNativeFoundation else ifneq ($(PLATFORM), windows) CFLAGS += -DWITH_X11 - ifeq ($(PLATFORM), macosx)) - OTHER_LDLIBS += -liconv - CPPFLAGS += -I$(OPENWIN_HOME)/include \ - -I$(OPENWIN_HOME)/include/X11/extensions - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -pthread - else - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread - endif + CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions + OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread else # PLATFORM CFLAGS += -DWITH_WIN32 OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll #$(JVMLIB) $(OBJDIR)/../../jpeg/$(OBJDIRNAME)/jpeg$(SUFFIX).lib endif # PLATFORM +# Add giflib include path for all platforms +CPPFLAGS += -I$(SHARE_SRC)/native/sun/awt/giflib + # # Add to ambient vpath to get files in a subdirectory #