blob: 5d8b1a4e63bf8212204839e4706c55a81f4c6ae5 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
--- jdk/make/sun/splashscreen/Makefile 2013-09-06 14:27:41.000000000 -0400
+++ jdk/make/sun/splashscreen/Makefile 2014-04-30 00:10:52.000000000 -0400
@@ -61,6 +61,12 @@
CFLAGS += -DSPLASHSCREEN
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
+ifneq ($(SYSTEM_ZLIB),true)
+ CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+endif
+
ifeq ($(PLATFORM), macosx)
CFLAGS += -DWITH_MACOSX
@@ -121,11 +127,7 @@
CPPFLAGS += $(call NativeSrcDirList,-I,native/$(PKGDIR)/splashscreen)
CPPFLAGS += $(call NativeSrcDirList,-I,/native/sun/osxapp)
endif
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
-ifneq ($(SYSTEM_ZLIB),true)
- CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-else
+ifeq ($(SYSTEM_ZLIB),true)
OTHER_CFLAGS += $(ZLIB_CFLAGS)
OTHER_LDLIBS += $(ZLIB_LIBS)
endif
|
