Changeset 42306 in vbox

Timestamp:

Jul 22, 2012 2:06:22 AM (13 years ago)

Author:

vboxsync

Message:

Only find a suitable midl.exe once (Main and VBoxNetFlt was doing it).

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (2 diffs)
• src/VBox/Main/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -1812 +1812 @@
  PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
 endif
+
+# The Microsoft IDL compiler (the SDK build needs this on non-Windows).
+VBOX_WIN_MIDL ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(firstword $(wildcard \
+        $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee]\
+        $(PATH_SDK_$(VBOX_WINPSDK))/[Bb][Ii][Nn]/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee]\
+        $(PATH_SDK_WINPSDK_BIN)/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee]\
+        $(PATH_SDK_WINPSDK)/[Bb][Ii][Nn]/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee]\
+        $(PATH_DEVTOOLS)/win.x86/bin/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee]\
+        ) Sorry_Cannot_Find_The_Midl_Compiler_In_The_PSDK))
 
 # XPCOM setup for all but win32.

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

@@ -237 +237 @@
  VBoxNetFltNobj_CLEAN      = $(VBoxNetFltNobj_DEPS)
 
- VBOXNETFLT_NOBJ_IDL      ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(firstword $(wildcard \
-        $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/Midl.Exe\
-        $(PATH_SDK_$(VBOX_WINPSDK))/Bin/Midl.Exe\
-        $(PATH_DEVTOOLS)/win.x86/bin/midl.exe\
-        ) Sorry_Cannot_Find_The_Midl_Compiler_In_The_PSDK))
-
 $$(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT_i.c \
 + $$(VBoxNetFltNobj_0_OUTDIR)/VBoxNetFltNobjT_p.c \
@@ -250 +244 @@
                 $(PATH_SUB_CURRENT)/win/nobj/VBoxNetFltNobjT.idl \
                 | $$(dir $$@)
-        $(VBOXNETFLT_NOBJ_IDL) /nologo \
+        $(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))) \

trunk/src/VBox/Main/Makefile.kmk

@@ -793 +793 @@
         $(QUIET)$(VBOX_XPIDL_ENV)$(VBOX_XPIDL) -m header  -I $(VBOX_PATH_XPCOM_IDL) -e $@ $<
 
-
-VBOX_MAIN_IDL ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(firstword $(wildcard \
-        $(PATH_SDK_$(VBOX_WINPSDK)_BIN)/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee]\
-        $(PATH_SDK_$(VBOX_WINPSDK))/[Bb][Ii][Nn]/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee]\
-        $(PATH_SDK_WINPSDK_BIN)/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee]\
-        $(PATH_SDK_WINPSDK)/[Bb][Ii][Nn]/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee]\
-        $(PATH_DEVTOOLS)/win.x86/bin/[Mm][Ii][Dd][Ll].[Ee][Xx][Ee]\
-        ) Sorry_Cannot_Find_The_Midl_Compiler_In_The_PSDK))
-IDL_DEFS = /nologo
-
 $(VBOX_IDL_FILE.MSCOM): $(VBOX_PATH_MAIN_SRC)/idl/midl.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
         $(call MSG_TOOL,xsltproc,VBoxSVC,$<,$@)
@@ -819 +809 @@
 + $(VBoxCOM_0_OUTDIR)/VirtualBox.h \
 + $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb: $(VBOX_IDL_FILE.MSCOM) | $$(dir $$@)
-        $(VBOX_MAIN_IDL) $(IDL_DEFS) \
+        $(VBOX_WIN_MIDL) /nologo \
                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxCOM_0_OUTDIR)) \
                 /cpp_cmd $(subst $(EXEC_X86_WIN32),,$(call VBOX_FN_MAKE_WIN_PATH,$(TOOL_$(VBOX_VCC_TOOL)_CC))) \