Changeset 83804 in vbox for trunk/src

Timestamp:

Apr 18, 2020 10:44:09 PM (5 years ago)

Author:

vboxsync

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

137330

Message:

/Config.kmk,Main,VBoxNetFlt: Move the VBOX_MIDL_REDIRECT tricks up to Config.kmk as it's needed outside Main too (VBoxNetFlt). bugref:8489

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (1 diff)
• Main/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -401 +401 @@
                 $(PATH_SUB_CURRENT)/win/nobj/VBoxNetFltNobjT.idl \
                 | $$(dir $$@)
-        $(VBOX_WIN_MIDL) /nologo \
+        $(VBOX_MIDL_REDIRECT) $(VBOX_WIN_MIDL) /nologo \
                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxNetFltNobj_0_OUTDIR)) \
-                /cpp_cmd $(subst $(EXEC_X86_WIN32),,$(call VBOX_FN_MAKE_WIN_PATH,$(TOOL_$(VBOX_VCC_TOOL)_CC))) \
+                /cpp_cmd $(VBOX_MIDL_CPP_CMD) \
                 $(addprefix /I , $(call VBOX_FN_MAKE_WIN_PATH,$(SDK_$(VBOX_WINDDK)_INCS))) \
                 $(call VBOX_FN_MAKE_WIN_PATH,$<)

trunk/src/VBox/Main/Makefile.kmk

@@ -1433 +1433 @@
 endef
 
-# Tricks to work around midl.exe problems with spaces in the /cpp_cmd value, it
-# forgets to quote it when creating the commandline and cl.exe gets very confused.
-if1of (quote, $(KBUILD_FEATURES))
-VBOX_MIDL_REDIRECT     = $(REDIRECT) -E "$(quote-sh-dq PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL)_BIN);$(PATH))" --
-VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) -E "$(quote-sh-dq PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN);$(PATH))" --
-else
-VBOX_MIDL_REDIRECT     = $(REDIRECT) -E 'PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL)_BIN);$(PATH)' --
-VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) -E 'PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN);$(PATH)' --
-endif
-VBOX_MIDL_CPP_CMD      = $(lastword $(notdir ,$(subst $(EXEC_X86_WIN32),,$(TOOL_$(VBOX_VCC_TOOL)_CC))))
-VBOX_MIDL_CPP_CMD_X86  = $(lastword $(notdir ,$(subst $(EXEC_X86_WIN32),,$(TOOL_$(VBOX_VCC_TOOL_STEM)X86_CC))))
-
 # Note! Because we've got a different proxy stub DLL for pre windows 7 64-bit hosts, we target windows 7 for AMD64.
 #       The output is different and hopefully more efficient, at least memory wise (using more helpers in OLE32).