Remove redundant defines and add build check for MW module

rhargreaves · Sep 7, 2024 · 9ec209c · 9ec209c
1 parent 4b78212
commit 9ec209c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -16,7 +16,6 @@
                 "DEBUG",
                 "DEBUG_EVENTS",
                 "DEBUG_TICKS",
-                "MODULE_MEGAWIFI=1",
                 "BUILD=\"dev\""
             ],
             "cStandard": "c11",

diff --git a/Makefile b/Makefile
@@ -8,8 +8,7 @@ release: res/samples
 
 include $(SGDK)/makefile.gen
 
-EXTRA_FLAGS:=-DMODULE_MEGAWIFI=1 \
-	-DBUILD='"$(BUILD)"' \
+EXTRA_FLAGS:=-DBUILD='"$(BUILD)"' \
 	-Wl,--wrap=SYS_enableInts \
 	-Wl,--wrap=SYS_disableInts
 

diff --git a/src/build_checks.h b/src/build_checks.h
@@ -1,3 +1,7 @@
 #if (ENABLE_BANK_SWITCH == 0)
 #error Bank switching support disabled. Build SGDK with ENABLE_BANK_SWITCH = 1
 #endif
+
+#if (MODULE_MEGAWIFI == 0)
+#error MegaWiFi module disabled. Build SGDK with MODULE_MEGAWIFI = 1
+#endif
diff --git a/tests/Makefile b/tests/Makefile
@@ -23,7 +23,6 @@ INCLUDE_DIRS+=-I$(CMOCKA_DIR)/include
 CFLAGS=$(INCLUDE_DIRS) \
 	-DBUILD='"$(BUILD)"' \
 	-DUNIT_TESTS \
-	-DMODULE_MEGAWIFI=1 \
 	-ggdb \
 	-O0 \
 	-Wall \