Changeset 99791 in vbox
- Timestamp:
- May 15, 2023 3:47:40 PM (17 months ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
Config.kmk (modified) (2 diffs)
-
include/iprt/assertcompile.h (modified) (1 diff)
-
include/iprt/cdefs.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r99747 r99791 2005 2005 ifdef VBOX_WITH_DRIVERLESS_FORCED 2006 2006 DEFS += VBOX_WITH_DRIVERLESS_FORCED 2007 endif 2008 ifdef VBOX_WITH_PARFAIT 2009 DEFS += VBOX_WITH_PARFAIT 2010 ifeq ($(KBUILD_TARGET),win) 2011 DEFS += RT_RELAXED_CALLBACKS_TYPES 2012 endif 2007 2013 endif 2008 2014 … … 2570 2576 # Tricks to work around midl.exe problems with spaces in the /cpp_cmd value, it 2571 2577 # 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)))" -- 2578 ifndef 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 2575 2586 else 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 2578 2594 endif 2579 2595 VBOX_MIDL_CPP_CMD = $(lastword $(notdir ,$(subst $(EXEC_X86_WIN32),,$(TOOL_$(VBOX_VCC_TOOL)_CC)))) -
trunk/include/iprt/assertcompile.h
r98103 r99791 88 88 */ 89 89 #ifdef _MSC_VER 90 # if _MSC_VER >= 1600 && defined(__cplusplus) 90 # if _MSC_VER >= 1600 && defined(__cplusplus) && !defined(VBOX_WITH_PARFAIT) 91 91 # define RTASSERT_HAVE_STATIC_ASSERT 92 92 # endif -
trunk/include/iprt/cdefs.h
r99755 r99791 1170 1170 # error "Port me!" 1171 1171 #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 1172 1184 1173 1185 /** @def RT_COMPILER_WITH_128BIT_INT_TYPES
Note:
See TracChangeset
for help on using the changeset viewer.

