VirtualBox

Changeset 84540 in vbox for trunk/src


Ignore:
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
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/3D/mesa/Makefile.kmk

    r84533 r84540  
    123123        $(VBOX_MESA)/src/gallium/state_trackers/wgl \
    124124        $(TEMPLATE_VBoxMesa3DGuestR3Dll_INCS)
    125 ifdef KMK_WITH_QUOTING
     125ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    126126TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS          = \
    127127        $(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \

  • trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

    r84533 r84540  
    2626endif
    2727VBoxTray_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST)
    28 ifdef KMK_WITH_QUOTING
     28ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    2929 VBoxTray_DEFS   := VBOX_WITH_HGCM VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
    3030else

  • trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

    r84533 r84540  
    8888        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,)
    8989
    90 ifdef KMK_WITH_QUOTING
     90ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    9191VBoxService_DEFS         += VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
    9292else

  • trunk/src/VBox/Devices/Makefile.kmk

    r84533 r84540  
    13051305   tstIntNetHardened-1_TEMPLATE = VBoxR3HardenedTstExe
    13061306   tstIntNetHardened-1_NAME     = tstIntNet-1
    1307    ifdef KMK_WITH_QUOTING
     1307   ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    13081308    tstIntNetHardened-1_DEFS    = PROGRAM_NAME_STR="tstIntNet-1"
    13091309   else
    … …  
    15111511        IN_VMSVGA3D \
    15121512        VBOX_WINE_WITH_IPRT
    1513  ifdef KMK_WITH_QUOTING
     1513 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    15141514 VBoxSVGA3D_DEFS        += \
    15151515        WINE_UNICODE_API= \

  • trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

    r84533 r84540  
    108108 DLLS += VBoxDTraceCmd
    109109 VBoxDTraceCmd_TEMPLATE = VBoxR3ExtPackDTrace
    110  ifdef KMK_WITH_QUOTING
     110 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    111111 VBoxDTraceCmd_DEFS = RTMEM_WRAP_TO_EF_APIS VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME="$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)"
    112112 else

  • trunk/src/VBox/HostDrivers/Support/testcase/Makefile.kmk

    r84533 r84540  
    109109
    110110tstGIP-2Hardened_TEMPLATE = VBoxR3HardenedTstExe
    111 ifdef KMK_WITH_QUOTING
     111ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    112112 tstGIP-2Hardened_DEFS = PROGRAM_NAME_STR="tstGIP-2"
    113113else

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

    r84422 r84540  
    401401                $(PATH_SUB_CURRENT)/win/nobj/VBoxNetFltNobjT.idl \
    402402                | $$(dir $$@)
    403 ifdef KMK_WITH_QUOTING
     403ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    404404        $(VBOX_MIDL_REDIRECT) $(VBOX_WIN_MIDL) /nologo \
    405405                /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxNetFltNobj_0_OUTDIR)) \

  • trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk

    r84533 r84540  
    4848endif
    4949VBoxUSB_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
    50 ifdef KMK_WITH_QUOTING
     50ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    5151 VBoxUSB_DEFS      := IN_RT_R0 IN_SUP_R0 VBOX_DBG_LOG_NAME="USBDev"
    5252else
    … …  
    8080VBoxUSBMon_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
    8181VBoxUSBMon_DEFS        = IN_RT_R0 IN_SUP_R0 NTDDI_WINNT=_NTDDI_VISTA VBOXUSBFILTERMGR_USB_SPINLOCK
    82 ifdef KMK_WITH_QUOTING
     82ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    8383 VBoxUSBMon_DEFS      += VBOX_DBG_LOG_NAME="USBMon"
    8484else

  • trunk/src/VBox/Main/Makefile.kmk

    r84533 r84540  
    12451245endif # !win
    12461246
    1247 ifdef KMK_WITH_QUOTING
     1247ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    12481248glue/VBoxLogRelCreate.cpp_DEFS = KBUILD_TYPE="$(KBUILD_TYPE)"
    12491249else
    … …  
    13131313 DLLS += VBoxProxyStub
    13141314 VBoxProxyStub_TEMPLATE = VBOXMAINCOMP
    1315  ifdef KMK_WITH_QUOTING
     1315 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    13161316  VBoxProxyStub_DEFS   := REGISTER_PROXY_DLL PROXY_CLSID_IS=$(quote $(VBOX_MIDL_PROXY_CLSID_IS))
    13171317 else

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

    r84533 r84540  
    4848  VBoxTestOGL_DEFS.darwin      = DARWIN=1 GL_GLEXT_LEGACY _GNU_SOURCE
    4949  VBoxTestOGL_DEFS.freebsd     = FreeBSD=1 _GNU_SOURCE
    50   ifdef KMK_WITH_QUOTING
     50  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    5151   VBoxTestOGL_DEFS = VBOX_BUILD_TARGET="$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)"
    5252  else

  • trunk/src/VBox/NetworkServices/Dhcpd/Makefile.kmk

    r84533 r84540  
    5050VBoxNetDHCP_INCS += . $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_INCS))
    5151
    52 ifdef KMK_WITH_QUOTING
     52ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    5353VBoxNetDHCP_DEFS      = KBUILD_TYPE="$(KBUILD_TYPE)"
    5454else

  • trunk/src/VBox/NetworkServices/NAT/Makefile.kmk

    r84533 r84540  
    3737VBoxNetNATHardened_TEMPLATE = VBOXR3HARDENEDEXE
    3838VBoxNetNATHardened_NAME     = VBoxNetNAT
    39   ifdef KMK_WITH_QUOTING
     39  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    4040VBoxNetNATHardened_DEFS     = SERVICE_NAME="VBoxNetNAT"
    4141  else

  • trunk/src/VBox/Runtime/Makefile.kmk

    r84533 r84540  
    154154        IPRT_BLDCFG_VERSION_MINOR=$(VBOX_VERSION_MINOR) \
    155155        IPRT_BLDCFG_VERSION_BUILD=$(VBOX_VERSION_BUILD)
    156 ifdef KMK_WITH_QUOTING
     156ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    157157common/misc/buildconfig.cpp_DEFS += \
    158158        IPRT_BLDCFG_VERSION_STRING="$(VBOX_VERSION_STRING)" \
    … …  
    21832183endif
    21842184ifdef VBOX_WITH_DTRACE_R3
    2185  ifdef KMK_WITH_QUOTING
     2185 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    21862186  VBoxRT_DEFS                 += IPRT_WITH_DTRACE IPRT_DTRACE_INCLUDE="dtrace/iprt.h"
    21872187 else
    … …  
    26522652endif
    26532653if defined(VBOX_WITH_DTRACE_R0) && !defined(VBOX_ONLY_VALIDATIONKIT)
    2654  ifdef KMK_WITH_QUOTING
     2654 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    26552655  RuntimeR0_DEFS        += IPRT_WITH_DTRACE IPRT_DTRACE_PREFIX=VBOXVMM_ IPRT_DTRACE_INCLUDE="dtrace/VBoxVMM.h"
    26562656 else

  • trunk/src/VBox/Runtime/testcase/Makefile.kmk

    r84533 r84540  
    773773 tstRTR0DbgKrnlInfoDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
    774774 tstRTR0DbgKrnlInfoDriverHardened_NAME = tstRTR0DbgKrnlInfoDriver
    775  ifdef KMK_WITH_QUOTING
     775 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    776776  tstRTR0DbgKrnlInfoDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0DbgKrnlInfoDriver"
    777777 else
    … …  
    799799 tstRTR0MemUserKernelDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
    800800 tstRTR0MemUserKernelDriverHardened_NAME = tstRTR0MemUserKernelDriver
    801  ifdef KMK_WITH_QUOTING
     801 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    802802  tstRTR0MemUserKernelDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0MemUserKernelDriver"
    803803 else
    … …  
    824824 tstRTR0SemMutexDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
    825825 tstRTR0SemMutexDriverHardened_NAME = tstRTR0SemMutexDriver
    826  ifdef KMK_WITH_QUOTING
     826 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    827827  tstRTR0SemMutexDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0SemMutexDriver"
    828828 else
    … …  
    849849 tstRTR0ThreadDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
    850850 tstRTR0ThreadDriverHardened_NAME = tstRTR0ThreadDriver
    851  ifdef KMK_WITH_QUOTING
     851 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    852852  tstRTR0ThreadDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0ThreadDriver"
    853853 else
    … …  
    874874 tstRTR0TimerDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
    875875 tstRTR0TimerDriverHardened_NAME = tstRTR0TimerDriver
    876  ifdef KMK_WITH_QUOTING
     876 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    877877  tstRTR0TimerDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0TimerDriver"
    878878 else
    … …  
    899899 tstRTR0ThreadPreemptionDriverHardened_TEMPLATE = VBoxR3HardenedTstExe
    900900 tstRTR0ThreadPreemptionDriverHardened_NAME = tstRTR0ThreadPreemptionDriver
    901  ifdef KMK_WITH_QUOTING
     901 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    902902  tstRTR0ThreadPreemptionDriverHardened_DEFS = PROGRAM_NAME_STR="tstRTR0ThreadPreemptionDriver"
    903903 else

  • trunk/src/VBox/Runtime/tools/Makefile.kmk

    r84533 r84540  
    4646        IPRT_BLDCFG_VERSION_MINOR=$(VBOX_VERSION_MINOR) \
    4747        IPRT_BLDCFG_VERSION_BUILD=$(VBOX_VERSION_BUILD)
    48  ifdef KMK_WITH_QUOTING
     48 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    4949  bldRTIsoMaker_DEFS += \
    5050        IPRT_BLDCFG_VERSION_STRING="$(VBOX_VERSION_STRING)" \

  • trunk/src/VBox/VMM/Makefile.kmk

    r84533 r84540  
    247247
    248248# SSM wish to know the build type, host os and arch.
    249 ifdef KMK_WITH_QUOTING
     249ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    250250VMMR3/SSM.cpp_DEFS +=\
    251251        KBUILD_TYPE="$(KBUILD_TYPE)" \

  • trunk/src/VBox/VMM/testcase/Makefile.kmk

    r84533 r84540  
    218218tstGlobalConfigHardened_TEMPLATE = VBoxR3HardenedTstExe
    219219tstGlobalConfigHardened_NAME     = tstGlobalConfig
    220  ifdef KMK_WITH_QUOTING
     220 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    221221tstGlobalConfigHardened_DEFS     = PROGRAM_NAME_STR="tstGlobalConfig"
    222222 else
    … …  
    250250tstMMHyperHeapHardened_TEMPLATE = VBoxR3HardenedTstExe
    251251tstMMHyperHeapHardened_NAME     = tstMMHyperHeap
    252  ifdef KMK_WITH_QUOTING
     252 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    253253tstMMHyperHeapHardened_DEFS     = PROGRAM_NAME_STR="tstMMHyperHeap"
    254254 else
    … …  
    279279tstCFGMHardened_TEMPLATE = VBoxR3HardenedTstExe
    280280tstCFGMHardened_NAME     = tstCFGM
    281  ifdef KMK_WITH_QUOTING
     281 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    282282tstCFGMHardened_DEFS     = PROGRAM_NAME_STR="tstCFGM"
    283283 else
    … …  
    321321tstVMREQHardened_TEMPLATE = VBOXR3HARDENEDEXE
    322322tstVMREQHardened_NAME     = tstVMREQ
    323  ifdef KMK_WITH_QUOTING
     323 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    324324tstVMREQHardened_DEFS     = PROGRAM_NAME_STR="tstVMREQ"
    325325 else
    … …  
    341341tstAnimateHardened_TEMPLATE = VBOXR3HARDENEDEXE
    342342tstAnimateHardened_NAME     = tstAnimate
    343  ifdef KMK_WITH_QUOTING
     343 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    344344tstAnimateHardened_DEFS     = PROGRAM_NAME_STR="tstAnimate"
    345345 else
    … …  
    372372tstVMMHardened_TEMPLATE = VBOXR3HARDENEDEXE
    373373tstVMMHardened_NAME     = tstVMM
    374  ifdef KMK_WITH_QUOTING
     374 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    375375tstVMMHardened_DEFS     = PROGRAM_NAME_STR="tstVMM"
    376376 else
    … …  
    405405tstMicroHardened_TEMPLATE = VBOXR3HARDENEDEXE
    406406tstMicroHardened_NAME     = tstMicro
    407  ifdef KMK_WITH_QUOTING
     407 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    408408tstMicroHardened_DEFS     = PROGRAM_NAME_STR="tstMicro"
    409409 else
    … …  
    472472tstPDMAsyncCompletionHardened_TEMPLATE = VBOXR3HARDENEDEXE
    473473tstPDMAsyncCompletionHardened_NAME     = tstPDMAsyncCompletion
    474   ifdef KMK_WITH_QUOTING
     474  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    475475tstPDMAsyncCompletionHardened_DEFS     = PROGRAM_NAME_STR="tstPDMAsyncCompletion"
    476476  else
    … …  
    493493tstPDMAsyncCompletionStressHardened_TEMPLATE = VBOXR3HARDENEDEXE
    494494tstPDMAsyncCompletionStressHardened_NAME     = tstPDMAsyncCompletionStress
    495   ifdef KMK_WITH_QUOTING
     495  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    496496tstPDMAsyncCompletionStressHardened_DEFS     = PROGRAM_NAME_STR="tstPDMAsyncCompletionStress"
    497497  else

  • trunk/src/VBox/ValidationKit/utils/TestExecServ/Makefile.kmk

    r84533 r84540  
    3131PROGRAMS += TestExecService
    3232TestExecService_TEMPLATE = VBoxValidationKitR3
    33 ifdef KMK_WITH_QUOTING
     33ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    3434TestExecService_DEFS = \
    3535        KBUILD_TARGET="$(KBUILD_TARGET)" \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette