mirror of
https://github.com/86Box/86Box.git
synced 2026-02-23 18:08:20 -07:00
*manually* fix cmakelists conflict because stupid github won't let me reverse-merge fixes??
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user