Changeset 74223 in vbox for trunk/src

Timestamp:

Sep 12, 2018 2:19:07 PM (6 years ago)

Author:

vboxsync

Message:

libs/Makefile.kmk,xpcom18a4/Makefile.kmk: VBOX_ONLY_EXTPACK updates. bugref:9152

Location:

trunk/src/libs

Files:

• Makefile.kmk (modified) (3 diffs)
• xpcom18a4/Makefile.kmk (modified) (2 diffs)

trunk/src/libs/Makefile.kmk

@@ -73 +73 @@
 if defined(VBOX_WITH_MAIN) \
  && !defined(VBOX_ONLY_ADDITIONS) \
- && !defined(VBOX_ONLY_EXTPACKS) \
  && !defined(VBOX_ONLY_VALIDATIONKIT)
 
@@ -81 +80 @@
 
  # VPX for video capture.
- if defined(VBOX_WITH_LIBVPX) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK) \
+ if defined(VBOX_WITH_LIBVPX) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK) && !defined(VBOX_ONLY_EXTPACKS) \
    && ("$(SDK_VBOX_VPX_INCS)" == "$(SDK_VBOX_VPX_DEFAULT_INCS)")
   include $(PATH_SUB_CURRENT)/libvpx-1.6.1/Makefile.kmk
@@ -87 +86 @@
 
  # Opus for supporting audio when doing video capturing.
- if defined(VBOX_WITH_LIBOPUS) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK) \
+ if defined(VBOX_WITH_LIBOPUS) && !defined(VBOX_ONLY_DOCS) && !defined(VBOX_WITH_SDK) && !defined(VBOX_ONLY_EXTPACKS) \
    && ("$(SDK_VBOX_OPUS_INCS)" == "$(SDK_VBOX_OPUS_DEFAULT_INCS)")
   include $(PATH_SUB_CURRENT)/libopus-1.2.1/Makefile.kmk

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -72 +72 @@
 # length restrictions limit will be avoided. (Solaris, Mac?)
 #
-ifndef VBOX_ONLY_SDK
+if !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_EXTPACK)
 
 VBOX_XPCOM_LIBRARIES := \
@@ -133 +133 @@
 PROGRAMS += VBoxXPCOMIPCD
 
-endif # !VBOX_ONLY_SDK
+endif # !VBOX_ONLY_SDK && !VBOX_ONLY_EXTPACK