Changeset 94496 in vbox

Timestamp:

Apr 6, 2022 2:33:47 PM (3 years ago)

Author:

vboxsync

Message:

libs/Makefile.kmk: Don't need to build libpng unless we build main, I think.

File:

• trunk/src/libs/Makefile.kmk (modified) (3 diffs)

trunk/src/libs/Makefile.kmk

@@ -48 +48 @@
 
 # libjpeg for VRDP video redirection and ExtPack's DrvHostWebcam.
-if   (defined(VBOX_WITH_VRDP) || defined(VBOX_WITH_EXTPACK_PUEL)) \
+if  (defined(VBOX_WITH_VRDP) || defined(VBOX_WITH_EXTPACK_PUEL)) \
  && !defined(VBOX_ONLY_ADDITIONS)
  include $(PATH_SUB_CURRENT)/jpeg-9b/Makefile.kmk
@@ -58 +58 @@
  include $(PATH_SUB_CURRENT)/liblzf-3.4/Makefile.kmk
 endif
-
-
-# libpng for screenshots in main.
-if  !defined(VBOX_ONLY_ADDITIONS) \
- && !defined(VBOX_ONLY_DOCS) \
- && !defined(VBOX_ONLY_SDK) \
- && !defined(VBOX_ONLY_VALIDATIONKIT) \
- && "$(SDK_VBOX_LIBPNG_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.6.36"
- include $(PATH_SUB_CURRENT)/libpng-1.6.36/Makefile.kmk
-endif # !VBOX_ONLY_DOCS
 
 
@@ -123 +113 @@
  && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""
 
- # libopus for supporting audio with the video capture.
- 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
- endif
+ if  !defined(VBOX_ONLY_DOCS) \
+  && !defined(VBOX_ONLY_EXTPACKS) \
+  && !defined(VBOX_WITH_SDK)
+
+  # libopus for supporting audio with the video capture.
+  if   defined(VBOX_WITH_LIBOPUS) \
+    && ("$(SDK_VBOX_OPUS_INCS)" == "$(SDK_VBOX_OPUS_DEFAULT_INCS)")
+   include $(PATH_SUB_CURRENT)/libopus-1.2.1/Makefile.kmk
+  endif
 
 
- # libvpx is used for video capture.
- 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
+  # libpng for screenshots in main.
+  if  !defined(VBOX_ONLY_DOCS) \
+   && "$(SDK_VBOX_LIBPNG_INCS)" == "$(PATH_ROOT)/src/libs/libpng-1.6.36"
+   include $(PATH_SUB_CURRENT)/libpng-1.6.36/Makefile.kmk
+  endif
+
+
+  # libvpx is used for video capture.
+  if   defined(VBOX_WITH_LIBVPX) \
+    && ("$(SDK_VBOX_VPX_INCS)" == "$(SDK_VBOX_VPX_DEFAULT_INCS)")
+   include $(PATH_SUB_CURRENT)/libvpx-1.6.1/Makefile.kmk
+  endif
+
  endif
-
 
  # XPCOM is used as a COM on non-Windows platforms.