mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-01 17:49:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into if-oot-debug

Browse Source
This commit is contained in:
cadmic
2024-01-29 09:22:40 -08:00
parent 4f337cffa2 68b41d6b0d
commit 1aa50b9308
4 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+12 -6
View File
@@ -51,15 +51,11 @@ endif
# Version-specific settings
ifeq ($(VERSION),gc-eu-mq)
DEBUG := 0
CFLAGS += -DNON_MATCHING -DNDEBUG -DOOT_DEBUG=0
CPPFLAGS += -DNON_MATCHING -DNDEBUG -DOOT_DEBUG=0
OPTFLAGS := -O2 -g3
CFLAGS += -DNON_MATCHING
CPPFLAGS += -DNON_MATCHING
COMPARE := 0
else ifeq ($(VERSION),gc-eu-mq-dbg)
DEBUG := 1
CFLAGS += -DOOT_DEBUG=1
CPPFLAGS += -DOOT_DEBUG=1
OPTFLAGS := -O2
else
$(error Unsupported version $(VERSION))
endif
@@ -72,6 +68,16 @@ VENV := .venv
MAKE = make
CPPFLAGS += -fno-dollars-in-identifiers -P
ifeq ($(DEBUG),1)
CFLAGS += -DOOT_DEBUG=1
CPPFLAGS += -DOOT_DEBUG=1
OPTFLAGS := -O2
else
CFLAGS += -DNDEBUG -DOOT_DEBUG=0
CPPFLAGS += -DNDEBUG -DOOT_DEBUG=0
OPTFLAGS := -O2 -g3
endif
ifeq ($(OS),Windows_NT)
DETECTED_OS=windows
else