From 76a83d600197f140f424c94c3fde8ef1776f6476 Mon Sep 17 00:00:00 2001 From: starfrost013 Date: Fri, 4 Jul 2025 21:55:58 +0100 Subject: [PATCH] *manually* fix cmakelists conflict because stupid github won't let me reverse-merge fixes?? --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 504a563e3..2f654497d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,6 +137,11 @@ option(GDBSTUB "Enable GDB stub server for debugging" option(DEV_BRANCH "Development branch" OFF) option(DISCORD "Discord Rich Presence support" ON) option(DEBUGREGS486 "Enable debug register opeartion on 486+ CPUs" OFF) +# Remove when merged, should just be -D +option(NV_LOG "NVidia RIVA 128 debug logging" ON) +option(NV_LOG_ULTRA "Even more NVidia RIVA 128 debug logging" OFF) +option(LIBASAN "Enable compilation with the addresss sanitizer" OFF) + # Remove when merged, should just be -D option(NV_LOG "NVidia RIVA 128 debug logging" ON) option(NV_LOG_ULTRA "Even more NVidia RIVA 128 debug logging" OFF)