Changeset 11634 in vbox

Timestamp:

Aug 25, 2008 8:39:36 PM (16 years ago)

Author:

vboxsync

Message:

Config.kmk: cleanup sdk dir rework.

File:

• trunk/Config.kmk (modified) (7 diffs)

trunk/Config.kmk

@@ -2260 +2260 @@
 
 ifeq ($(KBUILD_TARGET),win)
-  TEMPLATE_VBOXMAINEXE_INCS              =  $(VBOX_PATH_SDK)/bindings/mscom/include
-
   TEMPLATE_VBOXMAINEXE_SDKS              = WINPSDK W2K3DDK
  ifdef VBOX_USE_VCC80
@@ -2293 +2291 @@
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls.lib
  TEMPLATE_VBOXMAINEXE_POST_CMDS          = $(VBOX_SIGN_IMAGE_CMDS)
- TEMPLATE_VBOXMAINEXE_INTERMEDIATES      = \
-        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
 
 else # the GCC guys:
 
-TEMPLATE_VBOXMAINEXE_INCS              =  $(VBOX_PATH_SDK)/bindings/xpcom/include
 TEMPLATE_VBOXMAINEXE_TOOL                = $(VBOX_GCC_TOOL)
 TEMPLATE_VBOXMAINEXE_CXXFLAGS            = -g -Wall -Wno-long-long -Wno-trigraphs -pipe -Wno-non-virtual-dtor -fshort-wchar -fpermissive -fexceptions -frtti $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden)
@@ -2341 +2336 @@
 TEMPLATE_VBOXMAINEXE_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
  endif
-TEMPLATE_VBOXMAINEXE_INTERMEDIATES      = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 
 endif # !win
@@ -2359 +2352 @@
  TEMPLATE_VBOXMAINEXE_LIBS              += \
         $(LIB_XPCOM)
-endif
+ TEMPLATE_VBOXMAINEXE_INTERMEDIATES     += \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
+
+else  # COM
+ TEMPLATE_VBOXMAINEXE_INCS              += \
+        $(VBOX_PATH_SDK)/bindings/mscom/include
+ TEMPLATE_VBOXMAINEXE_INTERMEDIATES     += \
+        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
+endif # COM
 
 #
@@ -2440 +2441 @@
 TEMPLATE_VBOXQTGUIEXE = VBox Qt GUI Executable
 TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
-
+TEMPLATE_VBOXQTGUIEXE_INCS = \
+        $(VBOX_PATH_QT)/include
 
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBOXQTGUIEXE_INCS =                   \
-        $(VBOX_PATH_SDK)/bindings/mscom/include \
-        $(VBOX_PATH_QT)/include
  # drag in library configuration (we need QMAKE_PRL_DEFINES)
  ifneq ($(LIB_QT_PRL),)
@@ -2483 +2482 @@
 
 else # the gcc guys:
- TEMPLATE_VBOXQTGUIEXE_INCS =                   \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include \
-        $(VBOX_PATH_QT)/include
  TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_GCC_TOOL)
  TEMPLATE_VBOXQTGUIEXE_DEFS.linux = _REENTRANT
@@ -2582 +2578 @@
         $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 else
+ TEMPLATE_VBOXQTGUIEXE_INCS += \
+        $(VBOX_PATH_SDK)/bindings/mscom/include
  TEMPLATE_VBOXQTGUIEXE_INTERMEDIATES += \
-        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
+        $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
 endif