Changeset 71336 in vbox for trunk

Timestamp:

Mar 14, 2018 3:08:49 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Cleanup/rework Makefile first of all: Plugins deployment, Qt modules, COM wrappers.

File:

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

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

@@ -924 +924 @@
         src/platform/win/WinKeyboard.cpp
 
-if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
- INSTALLS.linux += VirtualBox.qt.conf
- INSTALLS.solaris += VirtualBox.qt.conf
- VirtualBox.qt.conf_INST = $(INST_BIN)
- VirtualBox.qt.conf_MODE = 644
- VirtualBox.qt.conf_SOURCES = $(VirtualBox_0_OUTDIR)/qt.conf=>qt.conf
-
-$$(VirtualBox_0_OUTDIR)/qt.conf: $(PATH_SUB_CURRENT)/Makefile.kmk $(VBOX_VERSION_MK) | $$(@D)/
-        $(QUIET)$(RM) -f $@
-        $(QUIET)$(APPEND) $@ "[Paths]"
-        $(QUIET)$(APPEND) $@ "Plugins =" $(PATH_OUT)/$(INST_BIN)/plugins
-endif
-
 VirtualBox_SOURCES.darwin += \
         src/platform/darwin/CocoaEventHelper.mm \
@@ -973 +960 @@
 endif
 
+
+#
+# VirtualBox - GUI Application.
+# Deployment.
+#
+if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
+ INSTALLS.linux += VirtualBox.qt.conf
+ INSTALLS.solaris += VirtualBox.qt.conf
+ VirtualBox.qt.conf_INST = $(INST_BIN)
+ VirtualBox.qt.conf_MODE = 644
+ VirtualBox.qt.conf_SOURCES = $(VirtualBox_0_OUTDIR)/qt.conf=>qt.conf
+
+$$(VirtualBox_0_OUTDIR)/qt.conf: $(PATH_SUB_CURRENT)/Makefile.kmk $(VBOX_VERSION_MK) | $$(@D)/
+        $(QUIET)$(RM) -f $@
+        $(QUIET)$(APPEND) $@ "[Paths]"
+        $(QUIET)$(APPEND) $@ "Plugins =" $(PATH_OUT)/$(INST_BIN)/plugins
+endif
+
+
+#
+# VirtualBox - GUI Application.
 # The Qt modules we're using.
 # (The include directory and lib/framework for each module will be added by the Qt unit.)
+#
 VirtualBox_QT_MODULES = Core Gui Widgets PrintSupport
 VirtualBox_QT_MODULES.linux   += X11Extras
@@ -984 +993 @@
  VirtualBox_QT_MODULES += OpenGL
 endif
+
 
 # Pull in the ui files
@@ -1037 +1047 @@
 VirtualBox_INTERMEDIATES += $(VirtualBox_0_OUTDIR)/include/COMWrappers
 VirtualBox_CLEAN         += $(wildcard $(VirtualBox_0_OUTDIR)/include/*) $(PATH_TARGET)/VirtualBoxComWrapperFiles.dep
+
+#
+# VirtualBox - GUI Application.
+# Build generated COM wrappers as part of app.
+#
 VirtualBox_SOURCES       += $(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp