Fix for libsplashscreen. ihse-jdk-library-branch
authorihse
Fri, 04 May 2018 13:57:59 +0200
branchihse-jdk-library-branch
changeset 56529 43a1b4fb83b8
parent 56528 0bedb8bb962b
child 56547 3b9f0b44c57b
Fix for libsplashscreen.
make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk	Fri May 04 13:15:15 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Fri May 04 13:57:59 2018 +0200
@@ -765,7 +765,10 @@
   endif
 
   ifeq ($(USE_EXTERNAL_LIBJPEG), false)
-    LIBSPLASHSCREEN_EXTRA_SRC += libjavajpeg
+    # While the following ought to work, it will currently pull in the closed
+    # additions to this library, and this was not done previously in the build.
+    # LIBSPLASHSCREEN_EXTRA_SRC += libjavajpeg
+    LIBSPLASHSCREEN_EXTRA_SRC += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
   else
     LIBJPEG_LIBS := -ljpeg
   endif