From 341217b78eeadc5f4d790adcd23b1f41dea66ccf Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 24 Jun 2023 12:40:49 -0500
Subject: [PATCH] [nostalgia] Make run commands not require install

---
 Makefile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 9eac45bb..ea93c4e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
 PROJECT_NAME=nostalgia
 BUILDCORE_PATH=deps/buildcore
-VCPKG_PKGS=sdl2 jsoncpp
 include ${BUILDCORE_PATH}/base.mk
 
 ifeq ($(OS),darwin)
-	NOSTALGIA_STUDIO=./dist/${CURRENT_BUILD}/nostalgia-studio.app/Contents/MacOS/nostalgia-studio
+	NOSTALGIA_STUDIO=./build/${HOST}/${CURRENT_BUILD}/src/nostalgia/studio/nostalgia-studio.app/Contents/MacOS/nostalgia-studio
 	MGBA=/Applications/mGBA.app/Contents/MacOS/mGBA
 else
-	NOSTALGIA_STUDIO=./dist/${CURRENT_BUILD}/bin/nostalgia-studio
+	NOSTALGIA_STUDIO=./build/${HOST}/${CURRENT_BUILD}/src/nostalgia/studio/nostalgia-studio
 	MGBA=mgba-qt
 endif
 
@@ -16,19 +15,19 @@ pkg-gba: install
 	${ENV_RUN} ./scripts/pkg-gba sample_project
 
 .PHONY: run
-run: install
-	./dist/${CURRENT_BUILD}/bin/nostalgia sample_project
+run: build
+	./build/${HOST}/${CURRENT_BUILD}/src/nostalgia/player/nostalgia sample_project
 .PHONY: run-studio
-run-studio: install
+run-studio: build
 	${NOSTALGIA_STUDIO}
 .PHONY: gba-run
 gba-run: pkg-gba
 	${MGBA} nostalgia.gba
 .PHONY: debug
-debug: install
-	${DEBUGGER} ./dist/${CURRENT_BUILD}/bin/nostalgia sample_project
+debug: build
+	${DEBUGGER} ./build/${HOST}/${CURRENT_BUILD}/src/nostalgia/player/nostalgia sample_project
 .PHONY: debug-studio
-debug-studio: install
+debug-studio: build
 	${DEBUGGER} ${NOSTALGIA_STUDIO}
 
 .PHONY: configure-gba