mirror of
https://github.com/izzy2lost/xenia-edge.git
synced 2026-07-06 00:20:26 -07:00
Merge remote-tracking branch 'upstream/canary_experimental' into edge
This commit is contained in:
+3
-3
@@ -119,11 +119,13 @@ add_compile_definitions(
|
||||
VULKAN_HPP_NO_TO_STRING
|
||||
IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
||||
IMGUI_DISABLE_DEFAULT_FONT
|
||||
IMGUI_USE_STB_SPRINTF
|
||||
USE_CPP17 # Tabulate
|
||||
_LIB
|
||||
)
|
||||
|
||||
# Prevent ASan error from ImGUI
|
||||
add_compile_definitions($<$<NOT:$<CONFIG:Checked>>:IMGUI_USE_STB_SPRINTF>)
|
||||
|
||||
# ==============================================================================
|
||||
# Qt6 (optional, gated on the QT_DIR env var)
|
||||
# ==============================================================================
|
||||
@@ -218,8 +220,6 @@ if(MSVC)
|
||||
add_compile_definitions(
|
||||
$<$<CONFIG:Checked>:DEBUG>
|
||||
$<$<CONFIG:Checked>:NDEBUG>
|
||||
# STB_SPRINTF is incompatible with ASan runtime hooks.
|
||||
$<$<CONFIG:Checked>:IMGUI_USE_STB_SPRINTF_DISABLED>
|
||||
)
|
||||
|
||||
# Debug: /RTC1 requires the debug CRT, so strip it — we're on /MD. Pin
|
||||
|
||||
Reference in New Issue
Block a user