Changeset 50124 in vbox

Timestamp:

Jan 20, 2014 4:42:14 PM (11 years ago)

Author:

vboxsync

Message:

Main: use different file names for IID file, otherwise the SDK build gets confused as it handles both COM and XPCOM on one system

File:

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

trunk/src/VBox/Main/Makefile.kmk

@@ -119 +119 @@
  VBox-xpcom-bindings-lib_INST = $(INST_SDK)bindings/xpcom/lib/
  VBox-xpcom-bindings-lib_MODE = a+r,u+w
- VBox-xpcom-bindings-lib_SOURCES = $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
- VBox-xpcom-bindings-lib_CLEAN = $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
+ VBox-xpcom-bindings-lib_SOURCES = $(VBoxCOM_0_OUTDIR)/VirtualBox_XPCOM_i.c=>VirtualBox_i.c
+ VBox-xpcom-bindings-lib_CLEAN = $(VBoxCOM_0_OUTDIR)/VirtualBox_XPCOM_i.c
 
  VBOX_MAIN_PREREQS += $(VBOX_IDL_TYPELIB.XPCOM) $(VBOX_IDL_HEADER.XPCOM)
@@ -830 +830 @@
         glue/NativeEventQueue.cpp \
         glue/ErrorInfo.cpp \
-        glue/errorprint.cpp \
-        $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
+        glue/errorprint.cpp
 VBoxCOM_INCS          += \
         include
@@ -837 +836 @@
  VBoxCOM_DEFS.x86       = _WIN32_WINNT=0x0500
  VBoxCOM_DEFS.amd64     = _WIN32_WINNT=0x0510
+ VBoxCOM_SOURCES       += \
+        $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
 else # !win
  VBoxCOM_SOURCES       += \
+        $(VBoxCOM_0_OUTDIR)/VirtualBox_XPCOM_i.c \
         glue/xpcom/helpers.cpp
 endif # !win
@@ -968 +970 @@
 # Aliases for testing purposes.
 ifdef VBOX_WITH_XPCOM
-testidl:    $(VBOX_IDL_FILE.XPCOM) $(VBOX_IDL_TYPELIB.XPCOM) $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
+testidl:    $(VBOX_IDL_FILE.XPCOM) $(VBOX_IDL_TYPELIB.XPCOM) $(VBoxCOM_0_OUTDIR)/VirtualBox_XPCOM_i.c
 testidlhdr: $(VBOX_IDL_HEADER.XPCOM)
 else
@@ -976 +978 @@
 
 
-ifdef VBOX_WITH_XPCOM
-$(VBoxCOM_0_OUTDIR)/VirtualBox_i.c: $(VBOX_PATH_MAIN_SRC)/idl/xpidl_iid.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
+$(VBoxCOM_0_OUTDIR)/VirtualBox_XPCOM_i.c: $(VBOX_PATH_MAIN_SRC)/idl/xpidl_iid.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
         $(call MSG_TOOL,xsltproc,VBoxSVC,$<,$@)
         $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE)
-else
+
 $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c \
 + $(VBoxCOM_0_OUTDIR)/VirtualBox.h \
@@ -1006 +1007 @@
                 /I idl \
                 $(call VBOX_FN_MAKE_WIN_PATH,$<)
-endif
 
 #