Changeset 71333 in vbox

Timestamp:

Mar 14, 2018 3:03:39 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9049: Cleanup/rework Makefile first of all: Flags, headers, sources.

File:

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

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

@@ -223 +223 @@
 
 
+#
+# VirtualBox - GUI Application.
+# Compiling/linking flags.
+#
 ifneq ($(KBUILD_TARGET),win)
 VirtualBox_CXXFLAGS += -Wno-switch
@@ -245 +249 @@
 endif
 
-# delay loading causes VM process crashes due to the misbehave of the current QtOpenGLVBox4.dll we use
-# (i.e. it does not create the ogl context properly when loaded this way)
-#
-# @todo: investigate a better work-around and enable back delay loading since it is needed to avoid
-# crashes caused by buggy ogl drivers for the case 2D is not used (i.e. no ogl stuff loaded)
-#if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
-# VirtualBox_LDFLAGS.win += /DelayLoad:QtOpenGLVBox4.dll /DelayLoad:OPENGL32.dll
-#endif
-
 VirtualBox_LDFLAGS.darwin = \
         -framework AppKit -framework Carbon -framework IOKit \
@@ -309 +304 @@
 
 
+#
+# VirtualBox - GUI Application.
 # Headers containing definitions of classes that use the Q_OBJECT macro.
+#
 VirtualBox_QT_MOCHDRS = \
         src/VBoxAboutDlg.h \
@@ -545 +543 @@
 ifdef VBOX_GUI_WITH_NETWORK_MANAGER
  VirtualBox_QT_MOCHDRS += \
+        src/net/UIDownloader.h \
+        src/net/UIDownloaderAdditions.h \
+        src/net/UIDownloaderExtensionPack.h \
+        src/net/UIDownloaderUserManual.h \
         src/net/UINetworkManager.h \
         src/net/UINetworkManagerDialog.h \
@@ -553 +555 @@
         src/net/UINetworkCustomer.h \
         src/net/UIUpdateManager.h \
-        src/net/UIDownloader.h \
-        src/net/UIDownloaderAdditions.h \
-        src/net/UIDownloaderExtensionPack.h \
-        src/net/UIDownloaderUserManual.h \
         src/settings/global/UIGlobalSettingsProxy.h \
         src/settings/global/UIGlobalSettingsUpdate.h
@@ -571 +569 @@
 
 VirtualBox_QT_MOCHDRS.darwin += \
-    src/platform/darwin/UIWindowMenuManager.h
-
+        src/platform/darwin/UIWindowMenuManager.h
+
+
+#
+# VirtualBox - GUI Application.
 # Sources containing local definitions of classes that use the Q_OBJECT macro.
+#
 VirtualBox_QT_MOCSRCS = \
         src/extensions/QIArrowSplitter.cpp \
@@ -634 +636 @@
 endif
 
+
+#
+# VirtualBox - GUI Application.
+# Sources.
+#
 VirtualBox_SOURCES = \
         src/main.cpp \
@@ -881 +888 @@
 
 ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-VirtualBox_SOURCES += \
+ VirtualBox_SOURCES += \
         src/net/UINetworkManager.cpp \
         src/net/UINetworkManagerDialog.cpp \
@@ -953 +960 @@
 endif
 
-#
-# Drag and drop support.
-#
 ifdef VBOX_WITH_DRAG_AND_DROP
  VirtualBox_SOURCES += \