Changeset 76598 in vbox for trunk

Timestamp:

Jan 2, 2019 12:59:08 AM (6 years ago)

Author:

vboxsync

Message:

Main: GCC precompiled headers hacking.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (5 diffs)
• src-all/xpcom (added)
• src-all/xpcom/VBoxAPIWrap-precomp_gcc.h (moved) (moved from trunk/src/VBox/Main/src-all/win/VBoxAPIWrap-precomp_gcc.h )
• src-client/xpcom/precomp_gcc.h (copied) (copied from trunk/src/VBox/Main/src-client/win/precomp_vcc.h ) (3 diffs)
• src-server/xpcom/precomp_gcc.h (copied) (copied from trunk/src/VBox/Main/src-server/win/precomp_vcc.h ) (3 diffs)
• xml/Settings.cpp (modified) (3 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -216 +216 @@
  else if $(KMK_REVISION) >= 3250 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS) && !defined(KBUILD_USE_KOBJCACHE)
   VBoxAPIWrap_USES           = gccprecomp
-  VBoxAPIWrap_PCH_HDR       := $(PATH_SUB_CURRENT)/src-all/win/VBoxAPIWrap-precomp_gcc.h
+  VBoxAPIWrap_PCH_HDR       := $(PATH_SUB_CURRENT)/src-all/xpcom/VBoxAPIWrap-precomp_gcc.h
  endif
  VBoxAPIWrap_SOURCES         = \
@@ -252 +252 @@
   VBoxAPIWrap-x86_EXTENDS  = VBoxAPIWrap
   VBoxAPIWrap-x86_DTRACE_HDR_FLAGS = -32 # ugly, should be fixed in the tool in Config.kmk
-  ifeq ($(KBUILD_TARGET),win) ## @todo fix inheritance
+  ifeq ($(KBUILD_TARGET),win) ## @todo fix inheritance (fixed in r3253)
    VBoxAPIWrap-x86_USES     = vccprecomp
    VBoxAPIWrap-x86_PCH_HDR := $(PATH_SUB_CURRENT)/src-all/win/VBoxAPIWrap-precomp_vcc.h
@@ -347 +347 @@
  VBoxSVC_USES    += vccprecomp
  VBoxSVC_PCH_HDR := $(PATH_SUB_CURRENT)/src-server/win/precomp_vcc.h
+else if $(KMK_REVISION) >= 3250 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS) && !defined(KBUILD_USE_KOBJCACHE)
+ VBoxSVC_USES    += gccprecomp
+ VBoxSVC_PCH_HDR := $(PATH_SUB_CURRENT)/src-server/xpcom/precomp_gcc.h
 endif
 ## r=bird: If you really think you might need VBOX_WITH_RECORDING and VBOX_WITH_AUDIO_RECORDING both here and for
@@ -744 +747 @@
  VBoxC_USES     = vccprecomp
  VBoxC_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/win/precomp_vcc.h
+else if $(KMK_REVISION) >= 3250 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS) && !defined(KBUILD_USE_KOBJCACHE)
+ VBoxC_USES    += gccprecomp
+ VBoxC_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/xpcom/precomp_gcc.h
 endif
 VBoxC_DEFS = \
@@ -987 +993 @@
  VBoxClient-x86_TEMPLATE = VBoxMainComp-x86
  VBoxClient-x86_EXTENDS  = VBoxC
-if defined(VBOX_WITH_PRECOMPILED_HEADERS) && "$(KBUILD_TARGET)" == "win" ## @todo fix inheritance
+if defined(VBOX_WITH_PRECOMPILED_HEADERS) && "$(KBUILD_TARGET)" == "win" ## @todo fix inheritance (fixed in r3253)
  VBoxClient-x86_USES     = vccprecomp
  VBoxClient-x86_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/win/precomp_vcc.h

trunk/src/VBox/Main/src-client/xpcom/precomp_gcc.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VirtualBox COM - Visual C++ precompiled header for VBoxC.
+ * VirtualBox COM - GNU C++ precompiled header for VBoxC.
  */
 
@@ -17 +17 @@
 
 
-
 #include <iprt/cdefs.h>
-#include <iprt/win/winsock2.h>
-#include <iprt/win/windows.h>
 #include <VBox/cdefs.h>
 #include <iprt/types.h>
@@ -26 +23 @@
 #include <iprt/cpp/meta.h>
 #include <iprt/cpp/ministring.h>
-#include <VBox/com/microatl.h>
 #include <VBox/com/com.h>
 #include <VBox/com/array.h>
 #include <VBox/com/Guid.h>
 #include <VBox/com/string.h>
+#include <VBox/com/VirtualBox.h>
 
-#include "VBox/com/VirtualBox.h"
+#if 1
+# include "VirtualBoxBase.h"
+# include <new>
+# include <list>
+# include <map>
+# include <array>
+# include <errno.h>
+#endif
 
 #if defined(Log) || defined(LogIsEnabled)

trunk/src/VBox/Main/src-server/xpcom/precomp_gcc.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VirtualBox COM - Visual C++ precompiled header for VBoxSVC.
+ * VirtualBox COM - GNU C++ precompiled header for VBoxSVC.
  */
 
@@ -18 +18 @@
 
 #include <iprt/cdefs.h>
-#include <iprt/win/winsock2.h>
-#include <iprt/win/windows.h>
 #include <VBox/cdefs.h>
 #include <iprt/types.h>
@@ -25 +23 @@
 #include <iprt/cpp/meta.h>
 #include <iprt/cpp/ministring.h>
-#include <VBox/com/microatl.h>
 #include <VBox/com/com.h>
 #include <VBox/com/array.h>
 #include <VBox/com/Guid.h>
 #include <VBox/com/string.h>
+#include <VBox/com/VirtualBox.h>
 
-#include "VBox/com/VirtualBox.h"
+#if 1
+# include "VirtualBoxBase.h"
+# include <list>
+# include <vector>
+# include <new>
+# include <iprt/time.h>
+#endif
 
 #if defined(Log) || defined(LogIsEnabled)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1487 +1487 @@
  * Constructor. Needs to set sane defaults which stand the test of time.
  */
-Medium::Medium() :
+settings::Medium::Medium() :
     fAutoReset(false),
     hdType(MediumType_Normal)
@@ -1498 +1498 @@
  * machine settings have really changed and thus need to be written out to disk.
  */
-bool Medium::operator==(const Medium &m) const
+bool settings::Medium::operator==(const settings::Medium &m) const
 {
     return (this == &m)
@@ -1511 +1511 @@
 }
 
-const struct Medium Medium::Empty; /* default ctor is OK */
+const struct settings::Medium settings::Medium::Empty; /* default ctor is OK */
 
 /**