Changeset 84540 in vbox for trunk/src/VBox/Main

Timestamp:

May 26, 2020 3:06:13 PM (5 years ago)

Author:

vboxsync

Message:

Reverting r138262 (i.e. restoring VBOX_WITH_AUTOMATIC_DEFS_QUOTING). Corrected the conditions for it's definition instead. bugref:8489

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (2 diffs)
• src-helper-apps/OpenGLTest/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -1245 +1245 @@
 endif # !win
 
-ifdef KMK_WITH_QUOTING
+ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
 glue/VBoxLogRelCreate.cpp_DEFS = KBUILD_TYPE="$(KBUILD_TYPE)"
 else
@@ -1313 +1313 @@
  DLLS += VBoxProxyStub
  VBoxProxyStub_TEMPLATE = VBOXMAINCOMP
- ifdef KMK_WITH_QUOTING
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
   VBoxProxyStub_DEFS   := REGISTER_PROXY_DLL PROXY_CLSID_IS=$(quote $(VBOX_MIDL_PROXY_CLSID_IS))
  else

trunk/src/VBox/Main/src-helper-apps/OpenGLTest/Makefile.kmk

@@ -48 +48 @@
   VBoxTestOGL_DEFS.darwin      = DARWIN=1 GL_GLEXT_LEGACY _GNU_SOURCE
   VBoxTestOGL_DEFS.freebsd     = FreeBSD=1 _GNU_SOURCE
-  ifdef KMK_WITH_QUOTING
+  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    VBoxTestOGL_DEFS = VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
   else