Changeset 98144 in vbox for trunk/src/VBox/Installer/win/Stub

Timestamp:

Jan 19, 2023 2:52:34 PM (2 years ago)

Author:

vboxsync

Message:

Installer/win: s/VBOXR3STATIC/VBoxR3Static/ bugref:10348

File:

• trunk/src/VBox/Installer/win/Stub/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Installer/win/Stub/Makefile.kmk

@@ -29 +29 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later.
-TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC
-TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE)
+
+#
+# Special template variation.
+#
+TEMPLATE_VBoxStubTemplate          := Drop the signing, we will sign it later.
+TEMPLATE_VBoxStubTemplate_EXTENDS  := VBoxR3Static
+TEMPLATE_VBoxStubTemplate_POST_CMDS = $(NO_SUCH_VARIABLE)
+
 
 #
@@ -37 +42 @@
 #
 PROGRAMS += VBoxStub
-VBoxStub_TEMPLATE= VBOXSTUB
-VBoxStub_BLD_TRG_ARCH = x86
-VBoxStub_DEFS    = _WIN32_WINNT=0x0501 IN_RT_R3
+VBoxStub_TEMPLATE     := VBoxStubTemplate
+VBoxStub_BLD_TRG_ARCH := x86
+VBoxStub_DEFS         := _WIN32_WINNT=0x0501 IN_RT_R3
 
 VBoxStub_SOURCES = \
@@ -45 +50 @@
         VBoxStub.rc
 
-VBoxStub_SDKS += \
+VBoxStub_SDKS = \
         VBOX_NTDLL
-ifeq ($(KBUILD_TARGET_ARCH),x86)
 VBoxStub_LIBS += \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib \
-        $(VBOX_LIB_RUNTIME_STATIC)
-else
-VBoxStub_LIBS += \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/delayimp.lib \
-        $(PATH_STAGE_LIB)/RuntimeR3-x86.lib
-endif
+        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/delayimp.lib
 
 VBoxStub_LDFLAGS = -SubSystem:Windows -DelayLoad:comctl32.dll