Changeset 49797 in vbox for trunk/src

Timestamp:

Dec 5, 2013 11:25:05 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91129

Message:

Main: build fixes.

Location:

trunk/src/VBox/Main

Files:

• Config.kmk (added)
• Makefile.kmk (modified) (4 diffs)
• include/MediumImpl.h (modified) (1 diff)
• testcase/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -18 +18 @@
 SUB_DEPTH = ../../..
 include $(KBUILD_PATH)/subheader.kmk
+
+#
+# Make sure our Config.kmk is included.
+#
+ifndef VBOX_MAIN_CONFIG_KMK_INCLUDED
+ include $(PATH_SUB_CURRENT)/Config.kmk
+endif
 
 #
@@ -291 +298 @@
         $(VBoxSVC_0_OUTDIR) \
         $(dir $(VBOX_XML_SCHEMADEFS_H)) \
-        $(VBoxAPIWrap_0_OUTDIR) \
+        $(VBOX_MAIN_APIWRAPPER_INCS) \
         .
 VBoxSVC_INCS.win = \
@@ -618 +625 @@
         include \
         $(VBoxC_0_OUTDIR) \
-        $(VBoxAPIWrap_0_OUTDIR) \
+        $(VBOX_MAIN_APIWRAPPER_INCS) \
         $(dir $(VBOX_XML_SCHEMADEFS_H))
 VBoxC_INCS.win      = \
@@ -1045 +1052 @@
         $(VBOX_PATH_MAIN_SRC)/glue/tests/Makefile=>Makefile
 
-# moved those rules to the end so that VBoxAPIWrap_0_OUTDIR can be expanded without $$ trickery
+# Moved those rules to the end so that VBoxAPIWrap_0_OUTDIR can be expanded without $$ trickery.
 $(VBoxAPIWrap_RAWSRC) \
 +| $(VBoxAPIWrap_GENERATEDSOURCES): \

trunk/src/VBox/Main/include/MediumImpl.h

@@ -23 +23 @@
 #include <VBox/vd.h>
 #include "MediumWrap.h"
+#include "VirtualBoxBase.h"
+#include "AutoCaller.h"
 class Progress;
 class MediumFormat;

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -114 +114 @@
         tstCollector.cpp \
         ../src-server/Performance.cpp
-tstCollector_INCS     = ../include
+tstCollector_INCS     = ../include $(VBOX_MAIN_APIWRAPPER_INCS)
 tstCollector_DEFS    += VBOX_COLLECTOR_TEST_CASE
 tstCollector_LDFLAGS.darwin  += -lproc