Changeset 11637 in vbox

Timestamp:

Aug 25, 2008 11:32:39 PM (16 years ago)

Author:

vboxsync

Message:

VirtualBox4/Makefile.kmk: cleanup sdk dir rework.

File:

• trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -143 +143 @@
 
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBOXQT4GUIEXE_INCS = \
-        $(VBOX_PATH_SDK)/bindings/mscom/include
  TEMPLATE_VBOXQT4GUIEXE_TOOL = $(VBOX_VCC_TOOL)
  TEMPLATE_VBOXQT4GUIEXE_DEFS += \
@@ -177 +175 @@
 
 else # the gcc guys:
- TEMPLATE_VBOXQT4GUIEXE_INCS = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include
  TEMPLATE_VBOXQT4GUIEXE_TOOL = $(VBOX_GCC_TOOL)
  TEMPLATE_VBOXQT4GUIEXE_DEFS.linux = _REENTRANT
@@ -243 +239 @@
 
 # Add COM/XPCOM stuff
-TEMPLATE_VBOXQT4GUIEXE_LIBS            += \
+TEMPLATE_VBOXQT4GUIEXE_LIBS += \
         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
 ifdef VBOX_WITH_XPCOM
  ## @todo may be worth creating the VBOX_XPCOM SDK def, or just a SDK_VBOXXPCOM.
- TEMPLATE_VBOXQT4GUIEXE_DEFS            += VBOX_WITH_XPCOM
+ TEMPLATE_VBOXQT4GUIEXE_DEFS += VBOX_WITH_XPCOM
  ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-  TEMPLATE_VBOXQT4GUIEXE_DEFS           += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
- endif
- TEMPLATE_VBOXQT4GUIEXE_INCS            += \
+  TEMPLATE_VBOXQT4GUIEXE_DEFS += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+ endif
+ TEMPLATE_VBOXQT4GUIEXE_INCS += \
         $(VBOX_XPCOM_INCS)
- TEMPLATE_VBOXQT4GUIEXE_LIBS            += \
+ TEMPLATE_VBOXQT4GUIEXE_LIBS += \
         $(LIB_XPCOM)
-endif
+else  # COM
+ TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        $(VBOX_PATH_SDK)/bindings/mscom/include
+endif # COM
 
 #