Changeset 72529 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 12, 2018 3:40:17 PM (7 years ago)

Author:

vboxsync

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

123016

Message:

FE/Qt: Undo previous change, and fix the true issue: having too many includes, üpicking up stale files created by a build before enabling the shared libs in the GUI.

File:

• trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (4 diffs)

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

@@ -384 +384 @@
 VirtualBox_INCS = \
         $(VBOX_GUI_INC_DIRS) \
-        $(VirtualBox_0_OUTDIR)/include \
-        $(VBoxGlobal_0_OUTDIR)/include \
+        $(if-expr defined(VBOX_GUI_WITH_SHARED_LIBRARY),$(VBoxGlobal_0_OUTDIR)/include,$(VirtualBox_0_OUTDIR)/include) \
         $(VBOX_GRAPHICS_INCS)
 
@@ -395 +394 @@
  VirtualBoxVM_INCS = \
         $(VBOX_GUI_INC_DIRS) \
-        $(VirtualBoxVM_0_OUTDIR)/include \
         $(VBoxGlobal_0_OUTDIR)/include \
         $(VBOX_GRAPHICS_INCS)
@@ -2082 +2080 @@
  $$(VirtualBox_0_OUTDIR)/include/COMWrappers \
  + $(PATH_TARGET)/VirtualBoxComWrapperFiles.dep \
- + $(if-expr defined(VirtualBox_VBOX_COMWRAPPERS) \
+ +| $(if-expr defined(VirtualBox_VBOX_COMWRAPPERS) \
  , $(VirtualBox_VBOX_COMWRAPPERS) \
  , $$(VirtualBox_0_OUTDIR)/include/COMEnums.h \
@@ -2116 +2114 @@
  $$(VBoxGlobal_0_OUTDIR)/include/COMWrappers \
  + $(PATH_TARGET)/VBoxGlobalComWrapperFiles.dep \
- + $(if-expr defined(VBoxGlobal_VBOX_COMWRAPPERS) \
+ +| $(if-expr defined(VBoxGlobal_VBOX_COMWRAPPERS) \
  , $(VBoxGlobal_VBOX_COMWRAPPERS) \
  , $$(VBoxGlobal_0_OUTDIR)/include/COMEnums.h \