Changeset 104679 in vbox

Timestamp:

May 16, 2024 11:42:15 AM (7 months ago)

Author:

vboxsync

Message:

Main/Makefile.kmk: Some preliminary win.arm64 support, bugref:10392

File:

• trunk/src/VBox/Main/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -1013 +1013 @@
  VBoxC_DEFS.win.x86 += _WIN32_WINNT=0x0500
  VBoxC_DEFS.win.amd64 += _WIN32_WINNT=0x0510
+ VBoxC_DEFS.win.arm64 += _WIN32_WINNT=0x0510
 
  if $(KBUILD_TARGET) != "win" && $(VBOX_GCC_VERSION_CXX) >= 40900 # gcc 4.9.x (4.8.x is causing endless RT_ELEMENT trouble)
@@ -1401 +1402 @@
  VBoxCOM_DEFS.x86      = _WIN32_WINNT=0x0500
  VBoxCOM_DEFS.amd64    = _WIN32_WINNT=0x0510
+ VBoxCOM_DEFS.arm64    = _WIN32_WINNT=0x0510
  VBoxCOM_SOURCES      += \
         $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
@@ -1513 +1515 @@
   VBoxProxyStub_DEFS   += VBOX_WITH_SDS_CLIENT_WATCHER,)
  endif
- VBoxProxyStub_DEFS.win.x86 = WIN32
+ VBoxProxyStub_DEFS.win.x86   = WIN32
+ VBoxProxyStub_DEFS.win.arm64 = WIN32
  VBoxProxyStub_SDKS     = VBoxNtDll
  VBoxProxyStub_DEFPATH  = $(VBoxCOM_0_OUTDIR)/# Hack to workaround drive letter in $(VBoxCOM_0_OUTDIR)/ for CFLAGS hack below.
@@ -1526 +1529 @@
  VBoxProxyStub_VirtualBox_p.c_CFLAGS.x86 = /Gz # Workaround for incorrect ObjectStublessClient* prototypes in SDK v7.1.
 
- DLLS += VBoxProxyStubLegacy
- VBoxProxyStubLegacy_TEMPLATE = VBoxMainComp
- VBoxProxyStubLegacy_EXTENDS  = VBoxProxyStub
- VBoxProxyStubLegacy_DEFS     = $(VBoxProxyStub_DEFS) VBOX_IN_PROXY_STUB_LEGACY
- VBoxProxyStubLegacy_INCS     = $(VBoxCOM_0_OUTDIR)/legacy/
- VBoxProxyStubLegacy_SOURCES  = \
-        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_p.c \
-        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_i.c \
-        src-all/win/VBoxProxyStub.def \
-        src-all/win/VBoxProxyStubLegacy.rc \
-        src-all/win/VBoxProxyStub.c
- src-all/win/VBoxProxyStubLegacy.rc_DEPS = $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.tlb
+ ifn1of ($(KBUILD_TARGET_ARCH),arm64)
+  DLLS += VBoxProxyStubLegacy
+  VBoxProxyStubLegacy_TEMPLATE = VBoxMainComp
+  VBoxProxyStubLegacy_EXTENDS  = VBoxProxyStub
+  VBoxProxyStubLegacy_DEFS     = $(VBoxProxyStub_DEFS) VBOX_IN_PROXY_STUB_LEGACY
+  VBoxProxyStubLegacy_INCS     = $(VBoxCOM_0_OUTDIR)/legacy/
+  VBoxProxyStubLegacy_SOURCES  = \
+        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_p.c \
+        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_i.c \
+        src-all/win/VBoxProxyStub.def \
+        src-all/win/VBoxProxyStubLegacy.rc \
+        src-all/win/VBoxProxyStub.c
+  src-all/win/VBoxProxyStubLegacy.rc_DEPS = $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.tlb
+ endif
 
  ifdef VBOX_WITH_32_ON_64_MAIN_API
@@ -1684 +1689 @@
         $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
         $(VBOX_MIDL_REDIRECT) $(VBOX_WIN_MIDL) /nologo /W4 \
-                /env $(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.amd64" ,amd64,win32) \
+                /env $(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.amd64" ,amd64,$(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.arm64" ,arm64,win32)) \
                 /robust /protocol all /target $(if-expr defined(VBOX_WITH_MIDL_PROXY_STUB),NT61,NT51) \
                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxCOM_0_OUTDIR)) \