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

Timestamp:

May 9, 2023 1:02:23 PM (22 months ago)

Author:

vboxsync

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

157249

Message:

*kmk: VBOX_ONLY_SDK_ON_WINDOWS changes and cleanups. bugref:10442

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (5 diffs)
• cbinding/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -45 +45 @@
  include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
  include $(PATH_SUB_CURRENT)/cbinding/Makefile.kmk
- include $(PATH_SUB_CURRENT)/UnattendedTemplates/Makefile.kmk
  ifndef VBOX_ONLY_SDK
+  include $(PATH_SUB_CURRENT)/UnattendedTemplates/Makefile.kmk
   include $(PATH_SUB_CURRENT)/src-helper-apps/OpenGLTest/Makefile.kmk
- endif
- if defined(VBOX_WITH_OPEN_WATCOM) && defined(VBOX_WITH_UNATTENDED)
-  include $(PATH_SUB_CURRENT)/src-helper-apps/os2/Makefile.kmk
- endif
- if defined(VBOX_WITH_DEVMAPPER) && !defined(VBOX_ONLY_SDK)
-  include $(PATH_SUB_CURRENT)/src-helper-apps/VBoxVolInfo/Makefile.kmk
+  if defined(VBOX_WITH_OPEN_WATCOM) && defined(VBOX_WITH_UNATTENDED)
+   include $(PATH_SUB_CURRENT)/src-helper-apps/os2/Makefile.kmk
+  endif
+  ifdef VBOX_WITH_DEVMAPPER
+   include $(PATH_SUB_CURRENT)/src-helper-apps/VBoxVolInfo/Makefile.kmk
+  endif
  endif
 endif
@@ -221 +221 @@
 
 # The MS COM specific stuff.
-if defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+if "$(KBUILD_TARGET)" == "win" || (defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_SDK_ON_WINDOWS))
  OTHERS         += \
         $(VBOX_IDL_FILE.MSCOM)
@@ -1479 +1479 @@
 
 
-if defined(VBOX_WITH_MIDL_PROXY_STUB) && "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS)
+if defined(VBOX_WITH_MIDL_PROXY_STUB) && "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_SDK)
  #
  # Experimental COM proxy + stub DLL w/ automatic registration updating.
@@ -1659 +1659 @@
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
 
-if defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+if "$(KBUILD_TARGET)" == "win" || (defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_SDK_ON_WINDOWS))
 
  # Note! Because we've got a different proxy stub DLL for pre windows 7 64-bit hosts, we target windows 7 for AMD64.
@@ -1731 +1731 @@
  endif
 
-endif # defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+endif # "$(KBUILD_TARGET)" == "win" || (defined(VBOX_ONLY_SDK) && !defined(VBOX_ONLY_SDK_ON_WINDOWS))
 
 #

trunk/src/VBox/Main/cbinding/Makefile.kmk

@@ -82 +82 @@
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $^
 
-if !defined(VBOX_ONLY_SDK)
+ifndef VBOX_ONLY_SDK
 
  #
@@ -182 +182 @@
  endif
 
-endif # ! VBOX_ONLY_SDK
+endif # !VBOX_ONLY_SDK
 
 # generate rules.