comparison make/gensrc/GensrcIcons.gmk @ 11053:4316e603ae2a

Merge
author chegar
date Wed, 03 Dec 2014 19:28:35 +0000
parents e336cbd8b15e 97d8785e9ee5
children 31ba5abc1e41
comparison
equal deleted inserted replaced
3:eb97a9d7ab0c 5:10d19b2068b4
27 GENSRC_AWT_ICONS_SRC := 27 GENSRC_AWT_ICONS_SRC :=
28 GENSRC_AWT_ICONS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop 28 GENSRC_AWT_ICONS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop
29 GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/sun/awt/ 29 GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/sun/awt/
30 30
31 ifdef OPENJDK 31 ifdef OPENJDK
32 X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR) 32 X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
33 else 33 else
34 X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_API_DIR) 34 X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
35 endif 35 endif
36 36
37 GENSRC_AWT_ICONS_SRC += \ 37 GENSRC_AWT_ICONS_SRC += \
38 $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \ 38 $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
39 $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \ 39 $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \