Changeset 104102 in vbox

Timestamp:

Mar 28, 2024 10:49:46 AM (12 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162505

Message:

Config.kmk, xpcom18a4/Makfile.kmk: Adjusting jdk-1.8 usage according to recent folder structure changes; Previously the folder was jdk1.8.0.jdk, now it's jdk-1.8.jdk; macOS *md.h files now located under include/darwin subfolder.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/libs/xpcom18a4/java/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -3335 +3335 @@
    VBOX_JAVA_INC = $(firstword $(wildcard \
                         $(VBOX_PATH_MACOSX_SDK)/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers \
-                        /Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/include \
+                        /Library/Java/JavaVirtualMachines/jdk*1.8*.jdk/Contents/Home/include \
                         ) )
   else

trunk/src/libs/xpcom18a4/java/Makefile.kmk

@@ -59 +59 @@
         $(VBOX_PATH_XPCOM_SRC)/xpcom/build \
         $(VBOX_JXPCOM_JDEST)
+ VBoxJXpcom_INCS.darwin += \
+        $(VBOX_JAVA_INC)/darwin \
  VBoxJXpcom_SOURCES = \
         src/nsAppFileLocProviderProxy.cpp \