VirtualBox

Changeset 99791 in vbox


Ignore:
Timestamp:
May 15, 2023 3:47:40 PM (17 months ago)
Author:
vboxsync
Message:

Config.kmk,include/iprt: Workarounds for compiling with parfait on Windows, bugref:3409

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r99747 r99791  
    20052005ifdef VBOX_WITH_DRIVERLESS_FORCED
    20062006 DEFS += VBOX_WITH_DRIVERLESS_FORCED
     2007endif
     2008ifdef VBOX_WITH_PARFAIT
     2009 DEFS += VBOX_WITH_PARFAIT
     2010 ifeq ($(KBUILD_TARGET),win)
     2011  DEFS += RT_RELAXED_CALLBACKS_TYPES
     2012 endif
    20072013endif
    20082014
     
    25702576# Tricks to work around midl.exe problems with spaces in the /cpp_cmd value, it
    25712577# forgets to quote it when creating the commandline and cl.exe gets very confused.
    2572 if1of (quote, $(KMK_FEATURES))
    2573  VBOX_MIDL_REDIRECT    = $(REDIRECT) --prepend "$(quote-sh-dq PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL)_BIN);$(qaddsuffix ,;,$(PATH_TOOL_$(VBOX_VCC_TOOL)_DLL_BIN)))" --
    2574  VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) --prepend "$(quote-sh-dq PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN);$(qaddsuffix ,;,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_DLL_BIN)))" --
     2578ifndef VBOX_WITH_PARFAIT
     2579 if1of (quote, $(KMK_FEATURES))
     2580  VBOX_MIDL_REDIRECT    = $(REDIRECT) --prepend "$(quote-sh-dq PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL)_BIN);$(qaddsuffix ,;,$(PATH_TOOL_$(VBOX_VCC_TOOL)_DLL_BIN)))" --
     2581  VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) --prepend "$(quote-sh-dq PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN);$(qaddsuffix ,;,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_DLL_BIN)))" --
     2582 else
     2583  VBOX_MIDL_REDIRECT    = $(REDIRECT) --prepend 'PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL)_BIN);$(PATH)' --
     2584  VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) --prepend 'PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN);$(PATH)' --
     2585 endif
    25752586else
    2576  VBOX_MIDL_REDIRECT    = $(REDIRECT) --prepend 'PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL)_BIN);$(PATH)' --
    2577  VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) --prepend 'PATH=$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN);$(PATH)' --
     2587 if1of (quote, $(KMK_FEATURES))
     2588  VBOX_MIDL_REDIRECT    = $(REDIRECT) --prepend "$(quote-sh-dq PATH=$(VBOX_PARFAIT_PATH_BIN);$(qaddsuffix ,;,$(PATH_TOOL_$(VBOX_VCC_TOOL)_DLL_BIN)))" --
     2589  VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) --prepend "$(quote-sh-dq PATH=$(VBOX_PARFAIT_PATH_BIN);$(qaddsuffix ,;,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_DLL_BIN)))" --
     2590 else
     2591  VBOX_MIDL_REDIRECT    = $(REDIRECT) --prepend 'PATH=$(VBOX_PARFAIT_PATH_BIN);$(PATH)' --
     2592  VBOX_MIDL_REDIRECT_X86 = $(REDIRECT) --prepend 'PATH=$(VBOX_PARFAIT_PATH_BIN);$(PATH)' --
     2593 endif
    25782594endif
    25792595VBOX_MIDL_CPP_CMD      = $(lastword $(notdir ,$(subst $(EXEC_X86_WIN32),,$(TOOL_$(VBOX_VCC_TOOL)_CC))))
  • trunk/include/iprt/assertcompile.h

    r98103 r99791  
    8888 */
    8989#ifdef _MSC_VER
    90 # if _MSC_VER >= 1600 && defined(__cplusplus)
     90# if _MSC_VER >= 1600 && defined(__cplusplus) && !defined(VBOX_WITH_PARFAIT)
    9191#  define RTASSERT_HAVE_STATIC_ASSERT
    9292# endif
  • trunk/include/iprt/cdefs.h

    r99755 r99791  
    11701170# error "Port me!"
    11711171#endif
     1172
     1173
     1174/*
     1175 * The cl.exe frontend emulation of parfait is incorrect and
     1176 * it still defines __SIZEOF_INT128__ despite msvc not supporting this
     1177 * type and our code relying on the uint18_t type being a struct
     1178 * in inline assembler code.
     1179 */
     1180#if defined(_MSC_VER) && defined(VBOX_WITH_PARFAIT)
     1181# undef __SIZEOF_INT128__
     1182#endif
     1183
    11721184
    11731185/** @def RT_COMPILER_WITH_128BIT_INT_TYPES
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