Changeset 10059

Timestamp:

07/01/08 04:07:04 (2 months ago)

Author:

vboxsync

Message:

Added SDK header _INTERMEDIATES to the VBOXMAIN* templates to ensure correct build order. Corrected VBOXQTGUIEXE to do the same and not use DEPS.

Files:

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

trunk/Config.kmk

@@ -2211 +2211 @@
-        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls.lib
- TEMPLATE_VBOXMAINEXE_POST_CMDS          = $(VBOX_SIGN_IMAGE_CMDS)
+ TEMPLATE_VBOXMAINEXE_INTERMEDIATES      = \
+        $(VBOX_PATH_SDK)/include/VirtualBox.h
-
-else # the GCC guys:
@@ -2256 +2258 @@
-TEMPLATE_VBOXMAINEXE_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)'
- endif
+TEMPLATE_VBOXMAINEXE_INTERMEDIATES      = \
+        $(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h
-
-endif # !win
@@ -2481 +2485 @@
- TEMPLATE_VBOXQTGUIEXE_LIBS += \
-        $(LIB_XPCOM)
-DEP
+INTERMEDIATE
-        $(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h
-else
-DEP
+INTERMEDIATE
-        $(VBOX_PATH_SDK)/include/VirtualBox.h
-endif