Changeset 11907 in vbox for trunk

Timestamp:

Sep 1, 2008 10:01:54 AM (16 years ago)

Author:

vboxsync

Message:

Main/Makefile: MAKE_WIN_PATH -> VBOX_FN_MAKE_WIN_PATH

File:

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

trunk/src/VBox/Main/Makefile.kmk

@@ -38 +38 @@
  DLLS            += VBoxSettings VBoxC
  PROGRAMS        += VBoxSVC
- MAKE_WIN_PATH   = $(subst /,\\,$(1))
+ VBOX_FN_MAKE_WIN_PATH = $(subst /,\\,$(1))
 else
  # used by some rules
@@ -47 +47 @@
  include $(KBUILD_PATH)/sdks/WINPSDK.kmk
  # on Wine Z: is always FS root
- MAKE_WIN_PATH   = $(subst /,\\,$(patsubst /%,Z:/%,$(1)))
+ VBOX_FN_MAKE_WIN_PATH = $(subst /,\\,$(patsubst /%,Z:/%,$(1)))
 endif #!VBOX_ONLY_SDK
 
@@ -591 +591 @@
 
 
-MAIN_IDL ?= $(EXEC_X86_WIN32) $(call MAKE_WIN_PATH,$(firstword $(wildcard \
+MAIN_IDL ?= $(EXEC_X86_WIN32) $(call VBOX_FN_MAKE_WIN_PATH,$(firstword $(wildcard \
         $(PATH_SDK_WINPSDK_BIN)/Midl.Exe\
         $(PATH_SDK_WINPSDK)/Bin/Midl.Exe\
@@ -624 +624 @@
 + $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb: $(IDLFILE.MSCOM) | $(call DIRDEP,$(PATH_VBoxCOM))
         $(MAIN_IDL) $(IDL_DEFS) \
-                /out $(call MAKE_WIN_PATH,$(PATH_VBoxCOM)) \
-                /cpp_cmd $(subst $(EXEC_X86_WIN32),,$(call MAKE_WIN_PATH,$(TOOL_$(VBOX_VCC_TOOL)_CC))) \
-                /I $(call MAKE_WIN_PATH,$(PATH_SDK_WINPSDK_INC)) \
+                /out $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_VBoxCOM)) \
+                /cpp_cmd $(subst $(EXEC_X86_WIN32),,$(call VBOX_FN_MAKE_WIN_PATH,$(TOOL_$(VBOX_VCC_TOOL)_CC))) \
+                /I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_WINPSDK_INC)) \
                 /I idl \
-                $(call MAKE_WIN_PATH,$<)
+                $(call VBOX_FN_MAKE_WIN_PATH,$<)
         $(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/include
         $(CP) $(PATH_VBoxCOM)/VirtualBox.h $(VBOX_PATH_SDK)/bindings/mscom/include