Changeset 76620 in vbox for trunk

Timestamp:

Jan 2, 2019 10:18:02 PM (6 years ago)

Author:

vboxsync

Message:

Main,FE/Qt: Made precompiled headers work with the kObjCache feature.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• Main/Makefile.kmk (modified) (3 diffs)

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

@@ -2288 +2288 @@
   VBoxGlobal_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_vcc.h
 
- else if $(KMK_REVISION) >= 3250 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS) && !defined(KBUILD_USE_KOBJCACHE)
+ else if $(KMK_REVISION) >= 3256 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS)
   VBoxGlobal_USES      += gccprecomp
   VBoxGlobal_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_gcc.h

trunk/src/VBox/Main/Makefile.kmk

@@ -214 +214 @@
   VBoxAPIWrap_USES           = vccprecomp
   VBoxAPIWrap_PCH_HDR       := $(PATH_SUB_CURRENT)/src-all/win/VBoxAPIWrap-precomp_vcc.h
- else if $(KMK_REVISION) >= 3250 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS) && !defined(KBUILD_USE_KOBJCACHE)
+ else if $(KMK_REVISION) >= 3256 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS)
   VBoxAPIWrap_USES           = gccprecomp
   VBoxAPIWrap_PCH_HDR       := $(PATH_SUB_CURRENT)/src-all/xpcom/VBoxAPIWrap-precomp_gcc.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)
+else if $(KMK_REVISION) >= 3256 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS)
  VBoxSVC_USES    += gccprecomp
  VBoxSVC_PCH_HDR := $(PATH_SUB_CURRENT)/src-server/xpcom/precomp_gcc.h
@@ -747 +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)
+else if $(KMK_REVISION) >= 3256 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS)
  VBoxC_USES    += gccprecomp
  VBoxC_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/xpcom/precomp_gcc.h