Changeset 99706 in vbox for trunk/src/VBox/Main

Timestamp:

May 9, 2023 8:15:42 PM (19 months ago)

Author:

vboxsync

Message:

*.kmk: More SDK makefile cleanups. bugref:10442

File:

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

trunk/src/VBox/Main/Makefile.kmk

@@ -63 +63 @@
 VBOX_PATH_MAIN_SRC := $(PATH_SUB_CURRENT)
 
-ifdef VBOX_ONLY_SDK
+if defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_SDK_ON_WINDOWS)
  # HACK ALERT! VBoxCOM is skipped, but its output dir is referenced a lot. So, define it.
  VBoxCOM_0_OUTDIR := $(call TARGET_PATH,VBoxCOM)
@@ -1362 +1362 @@
 
 endif # !defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_EXTPACKS) (the ifndef is far above)
+
+
+#
+# VBoxCOM - COM Abstraction Layer library
+#
 ifndef VBOX_ONLY_SDK
-
-
- #
- # VBoxCOM - COM Abstraction Layer library
- #
  LIBRARIES += VBoxCOM
- VBoxCOM_TEMPLATE       = VBoxMainLib
- VBoxCOM_INTERMEDIATES  = $(VBOX_MAIN_PREREQS) \
-        $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
- VBoxCOM_SOURCES        = \
-        glue/com.cpp \
-        glue/VBoxLogRelCreate.cpp \
-        glue/GetVBoxUserHomeDirectory.cpp \
-        glue/initterm.cpp \
-        glue/string.cpp \
-        glue/string-base64.cpp \
-        glue/AutoLock.cpp \
-        glue/EventQueue.cpp \
-        glue/NativeEventQueue.cpp \
-        glue/ErrorInfo.cpp \
-        glue/errorprint.cpp
- VBoxCOM_INCS         += $(VBOX_MAIN_APIWRAPPER_INCS) \
-        include
- ifeq ($(KBUILD_TARGET),win)
-  ifdef VBOX_WITH_MIDL_PROXY_STUB
-   VBoxCOM_DEFS.win     = VBOX_WITH_AUTO_COM_REG_UPDATE
-  endif
-  ifdef VBOX_WITH_SDS
-   VBoxCOM_DEFS.win    += VBOX_WITH_SDS
-  endif
-  VBoxCOM_DEFS.x86      = _WIN32_WINNT=0x0500
-  VBoxCOM_DEFS.amd64    = _WIN32_WINNT=0x0510
-  VBoxCOM_SOURCES      += \
-        $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
-  VBoxCOM_CLEAN         = \
-        $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c \
-        $(VBoxCOM_0_OUTDIR)/VirtualBox_p.c \
-        $(VBoxCOM_0_OUTDIR)/dlldata.c \
-        $(VBoxCOM_0_OUTDIR)/VirtualBox.h \
-        $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb
-  VBoxCOM_CLEAN       += \
-        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_i.c \
-        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_p.c \
-        $(VBoxCOM_0_OUTDIR)/legacy/dlldata.c \
-        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.h \
-        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.tlb
-  VBoxCOM_BLDDIRS     = $(VBoxCOM_0_OUTDIR)/legacy/
- else # !win
-  VBoxCOM_SOURCES      += \
-        $(VBoxCOM_0_OUTDIR)/VirtualBox_XPCOM_i.c \
-        glue/xpcom/helpers.cpp
- endif # !win
-
- ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
-  glue/VBoxLogRelCreate.cpp_DEFS = KBUILD_TYPE="$(KBUILD_TYPE)"
- else
-  glue/VBoxLogRelCreate.cpp_DEFS = KBUILD_TYPE=\"$(KBUILD_TYPE)\"
- endif
+endif
+VBoxCOM_TEMPLATE       = VBoxMainLib
+VBoxCOM_INTERMEDIATES  = $(VBOX_MAIN_PREREQS) \
+        $(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
+VBoxCOM_SOURCES        = \
+        glue/com.cpp \
+        glue/VBoxLogRelCreate.cpp \
+        glue/GetVBoxUserHomeDirectory.cpp \
+        glue/initterm.cpp \
+        glue/string.cpp \
+        glue/string-base64.cpp \
+        glue/AutoLock.cpp \
+        glue/EventQueue.cpp \
+        glue/NativeEventQueue.cpp \
+        glue/ErrorInfo.cpp \
+        glue/errorprint.cpp
+VBoxCOM_INCS         += $(VBOX_MAIN_APIWRAPPER_INCS) \
+        include
+ifeq ($(KBUILD_TARGET),win)
+ ifdef VBOX_WITH_MIDL_PROXY_STUB
+  VBoxCOM_DEFS.win     = VBOX_WITH_AUTO_COM_REG_UPDATE
+ endif
+ ifdef VBOX_WITH_SDS
+  VBoxCOM_DEFS.win    += VBOX_WITH_SDS
+ endif
+ VBoxCOM_DEFS.x86      = _WIN32_WINNT=0x0500
+ VBoxCOM_DEFS.amd64    = _WIN32_WINNT=0x0510
+ VBoxCOM_SOURCES      += \
+        $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
+ VBoxCOM_CLEAN         = \
+        $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c \
+        $(VBoxCOM_0_OUTDIR)/VirtualBox_p.c \
+        $(VBoxCOM_0_OUTDIR)/dlldata.c \
+        $(VBoxCOM_0_OUTDIR)/VirtualBox.h \
+        $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb
+ VBoxCOM_CLEAN       += \
+        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_i.c \
+        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_p.c \
+        $(VBoxCOM_0_OUTDIR)/legacy/dlldata.c \
+        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.h \
+        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.tlb
+ VBoxCOM_BLDDIRS     = $(VBoxCOM_0_OUTDIR)/legacy/
+else # !win
+ VBoxCOM_SOURCES      += \
+        $(VBoxCOM_0_OUTDIR)/VirtualBox_XPCOM_i.c \
+        glue/xpcom/helpers.cpp
+endif # !win
+
+ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+ glue/VBoxLogRelCreate.cpp_DEFS = KBUILD_TYPE="$(KBUILD_TYPE)"
+else
+ glue/VBoxLogRelCreate.cpp_DEFS = KBUILD_TYPE=\"$(KBUILD_TYPE)\"
+endif
+
+# A couple of tricks to define VBoxCOM_0_OUTDIR for SDK builds and mkdir rule.
+$(call KB_FN_DO_PASS0_ON_TARGET,VBoxCOM)
+BLDDIRS += $(VBoxCOM_0_OUTDIR)
+
+
+ifndef VBOX_ONLY_SDK
 
  # 32-bit version of VBoxCOM.
@@ -1451 +1459 @@
   USES += qt5
  endif
-
 
 endif # !VBOX_ONLY_SDK