From e42c3a7dc89b3b695d08db8f09b5c675ac3141a2 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 30 Oct 2024 00:40:31 -0500 Subject: [PATCH] Fix 'make run' and 'make debug' --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7772c93..28be0ab 100644 --- a/Makefile +++ b/Makefile @@ -3,15 +3,15 @@ BUILDCORE_PATH=deps/buildcore VCPKG_PKGS= include ${BUILDCORE_PATH}/base.mk -ifeq ($(OS),darwin) - PROJECT_EXECUTABLE=./build/${BC_VAR_CURRENT_BUILD}/${PROJECT_NAME}.app/Contents/MacOS/SlideController +ifeq ($(BC_VAR_OS),darwin) + PROJECT_EXECUTABLE=./build/${BC_VAR_CURRENT_BUILD}/bin/${PROJECT_NAME}.app/Contents/MacOS/SlideController else - PROJECT_EXECUTABLE=./build/${BC_VAR_CURRENT_BUILD}/bin/SlideController + PROJECT_EXECUTABLE=./build/${BC_VAR_CURRENT_BUILD}/bin/${PROJECT_NAME} endif .PHONY: run -run: +run: build ${ENV_RUN} ${PROJECT_EXECUTABLE} .PHONY: debug -debug: +debug: build ${DEBUGGER} ${PROJECT_EXECUTABLE}