From 897ee839845195399b80064fd57b577b17e74005 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 25 Aug 2023 00:12:49 -0500
Subject: [PATCH] Update main Makefile for new buildcore

---
 Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 7d000213b..69ee7c699 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,22 @@
-PROJECT_NAME=nostalgia
+BC_VAR_PROJECT_NAME=nostalgia
 BUILDCORE_PATH=deps/buildcore
 include ${BUILDCORE_PATH}/base.mk
 
-ifeq ($(OS),darwin)
-	NOSTALGIA_STUDIO=./build/${CURRENT_BUILD}/bin/nostalgia-studio.app/Contents/MacOS/nostalgia-studio
+ifeq ($(BC_VAR_OS),darwin)
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/nostalgia-studio.app/Contents/MacOS/nostalgia-studio
 	MGBA=/Applications/mGBA.app/Contents/MacOS/mGBA
 else
-	NOSTALGIA_STUDIO=./build/${CURRENT_BUILD}/bin/nostalgia-studio
+	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/nostalgia-studio
 	MGBA=mgba-qt
 endif
 
 .PHONY: pkg-gba
 pkg-gba:
-	${ENV_RUN} ${PYTHON3} ./scripts/pkg-gba.py sample_project
+	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project
 
 .PHONY: run
 run: build
-	./build/${CURRENT_BUILD}/bin/nostalgia sample_project
+	./build/${BC_VAR_CURRENT_BUILD}/bin/nostalgia sample_project
 .PHONY: run-studio
 run-studio: build
 	${NOSTALGIA_STUDIO}
@@ -25,15 +25,15 @@ gba-run: pkg-gba
 	${MGBA} nostalgia.gba
 .PHONY: debug
 debug: build
-	${DEBUGGER} ./build/${CURRENT_BUILD}/bin/nostalgia sample_project
+	${BC_CMD_DEBUGGER} ./build/${BC_VAR_CURRENT_BUILD}/bin/nostalgia sample_project
 .PHONY: debug-studio
 debug-studio: build
-	${DEBUGGER} ${NOSTALGIA_STUDIO}
+	${BC_CMD_DEBUGGER} ${NOSTALGIA_STUDIO}
 
 .PHONY: configure-gba
 configure-gba:
-	${ENV_RUN} ${SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=release --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=release --build_root=${BC_VAR_BUILD_PATH}
 
 .PHONY: configure-gba-debug
 configure-gba-debug:
-	${ENV_RUN} ${SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=debug --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} --toolchain=deps/gbabuildcore/cmake/modules/GBA.cmake --target=gba --current_build=0 --build_type=debug --build_root=${BC_VAR_BUILD_PATH}