VBox

Timestamp:

Oct 17, 2024 11:40:55 AM (5 months ago)

Author:

vboxsync

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

165253

Message:

Additions/WINNT: Only force x86 build targets when on amd64, on arm64 we want arm64 versions of those tools and on x86 no override is necessray, bugref:10734

Location:

trunk/src/VBox/Additions/WINNT

Files:

: 5 edited

Installer/InstallHelper/Makefile.kmk (modified) (1 diff)
Installer/Loader/Makefile.kmk (modified) (1 diff)
Installer/Makefile.kmk (modified) (1 diff)
VBoxCredProv/Makefile.kmk (modified) (1 diff)
VBoxHook/testcase/Makefile.kmk (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk

-              r106061
+              r106434
 DLLS += VBoxGuestInstallHelper
 VBoxGuestInstallHelper_TEMPLATE        := VBoxGuestR3Dll
+VBoxGuestInstallHelper_BLD_TRG_ARCH    := x86
+if1of ($(KBUILD_TARGET_ARCH),amd64)
+ VBoxGuestInstallHelper_BLD_TRG_ARCH    := x86
+endif
 VBoxGuestInstallHelper_INST            := repackadd/resources/VBoxGuestInstallHelper/
 ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)

trunk/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk

-              r106266
+              r106434
 PROGRAMS += VBoxWindowsAdditions
 VBoxWindowsAdditions_TEMPLATE = VBoxGuestR3Exe
+VBoxWindowsAdditions_BLD_TRG_ARCH = x86
+if1of ($(KBUILD_TARGET_ARCH),amd64)
+ VBoxWindowsAdditions_BLD_TRG_ARCH = x86
+endif
 VBoxWindowsAdditions_DEFS    = _WIN32_WINNT=0x0400
 VBoxWindowsAdditions_INCS    = ../../include

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

-              r106321
+              r106434
 PROGRAMS += RegCleanup
 RegCleanup_TEMPLATE     := VBoxGuestR3Exe
+RegCleanup_BLD_TRG_ARCH := x86
+if1of ($(KBUILD_TARGET_ARCH),amd64)
+ RegCleanup_BLD_TRG_ARCH := x86
+endif
 RegCleanup_DEFS         := _WIN32_WINNT=0x0400
 RegCleanup_SOURCES      := \

trunk/src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk

r106061	r106434
62	62	VBoxCredProv_VBOX_IMPORT_CHECKER.win.x86 := vista
63	63	VBoxCredProv_VBOX_IMPORT_CHECKER.win.amd64 := vista
	64	VBoxCredProv_VBOX_IMPORT_CHECKER.win.arm64 := vista
64	65
65	66	include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk

r106061	r106434
43	43	tstHook_VBOX_IMPORT_CHECKER.win.x86 = $(NO_SUCH_VARIABLE)
44	44	tstHook_VBOX_IMPORT_CHECKER.win.amd64 = $(NO_SUCH_VARIABLE)
	45	tstHook_VBOX_IMPORT_CHECKER.win.arm64 = $(NO_SUCH_VARIABLE)
45	46
46	47	endif # VBOX_WITH_TESTCASES

Note: See TracChangeset for help on using the changeset viewer.