Changeset 98119 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jan 18, 2023 12:40:22 PM (23 months ago)

Author:

vboxsync

Message:

ValKit/Audio: Attempt at a more proper build fix for the vkathost.

File:

• trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk (modified) (6 diffs)

trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk

@@ -48 +48 @@
 
 #
+# Globals.
+#
+VBOX_PATH_SRC_DEVICES = $(PATH_ROOT)/src/VBox/Devices
+VKAT_PATH_AUDIO       = $(VBOX_PATH_SRC_DEVICES)/Audio
+
+
+#
 # Append what we build here to PROGRAMS (at the top because it's a bit messy).
 #
@@ -55 +62 @@
   ifdef VBOX_WITH_HOST_SHIPPING_AUDIO_TEST
    if !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
-    PROGRAMS.win += vkathost
+    PROGRAMS += vkathost
    endif
   endif
@@ -79 +86 @@
  ntPlayToneWaveX_SOURCES  = ntPlayToneWaveX.cpp
  ntPlayToneWaveX_LIBS    += \
-  WinMM.Lib
+        WinMM.Lib
 endif
 
@@ -86 +93 @@
 # The Validation Kit Audio Test (VKAT) utility.
 #
-VKAT_PATH_AUDIO = $(PATH_ROOT)/src/VBox/Devices/Audio
 vkat_TEMPLATE = VBoxValidationKitR3
 vkat_VBOX_IMPORT_CHECKER.win.x86 = nt4
 vkat_DEFS     = VBOX_AUDIO_VKAT IN_VMM_R3 IN_VMM_STATIC
-vkat_INCS    += \
+vkat_INCS     = \
         $(PATH_ROOT)/src/VBox/Devices/build \
         $(PATH_ROOT)/src/VBox/Devices \
@@ -181 +187 @@
 
 #
-# Build the valkit vkat to bin as VBoxAudioTest, so that it can be shipped with the host installer too.
-#
-# We use the same name as for the GAs, even if the binaries is the same as the
-# validation kit.
+# Build the valkit vkat to bin as VBoxAudioTest, so that it can be shipped with
+# the host installer too.
+#
+# Note: We also need to have this as a signed binary, so don't just copy the
+#       vkat binary to bin/ directory but built this as an own binary.
 #
 ifdef VBOX_WITH_HOST_SHIPPING_AUDIO_TEST
  ifn1of ($(KBUILD_TARGET), os2 freebsd netbsd openbsd)
   ifndef VBOX_ONLY_ADDITIONS
-   ifeq ($(KBUILD_TARGET), win)
-    # We also need to have this as a signed binary, so don't just copy the vkat binary from below to
-    # the bin/ directory but built this as an own binary.
-    #
-    ## @todo Not sure if we can make this more elegant, but works for me now.
-    vkathost_TEMPLATE   = VBoxR3Static
-    vkathost_EXTENDS    = vkat
-    vkathost_NAME       = VBoxAudioTest
-   else # On non-Windows we simply copy the vkat executable already built to save build time.
-    vkathost_TEMPLATE   = VBOXR3EXE
-    vkathost_SOURCES    = $(vkat_1_TARGET)=>VBoxAudioTest$(HOSTSUFF_EXE)
-    vkathost_MODE       = a+rx,u+w
-   endif
+   vkathost_TEMPLATE  := VBoxR3Static
+   vkathost_EXTENDS   := vkat
+   vkathost_INST      := $(INST_BIN)
+   vkathost_NAME      := VBoxAudioTest
+   vkathost_SOURCES    = \
+        $(vkat_SOURCES) \
+        $(VBOX_PATH_SRC_DEVICES)/build/VBoxDD.d
   endif
  endif
@@ -224 +225 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
+