From 986c76a4768822dcfe6a926e26e791c38b3e0d2b Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 25 Aug 2023 00:15:57 -0500 Subject: [PATCH] Update main Makefile for buildcore changes --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1868f99..430f35f 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ -BC_PROJECT_NAME=CppProject -BC_VCPKG_PKGS= +BC_VAR_PROJECT_NAME=CppProject +BC_VAR_VCPKG_PKGS= BUILDCORE_PATH=deps/buildcore include ${BUILDCORE_PATH}/base.mk -ifeq ($(BC_OS),darwin) - PROJECT_EXECUTABLE=./build/${BC_CURRENT_BUILD}/${BC_PROJECT_NAME}.app/Contents/MacOS/${BC_PROJECT_NAME} +ifeq ($(BC_VAR_OS),darwin) + PROJECT_EXECUTABLE=./build/${BC_VAR_CURRENT_BUILD}/${BC_VAR_PROJECT_NAME}.app/Contents/MacOS/${BC_VAR_PROJECT_NAME} else - PROJECT_EXECUTABLE=./build/${BC_CURRENT_BUILD}/bin/${BC_PROJECT_NAME} + PROJECT_EXECUTABLE=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} endif .PHONY: run @@ -14,4 +14,4 @@ run: build ${BC_ENVRUN} ${PROJECT_EXECUTABLE} .PHONY: debug debug: build - ${BC_ENVRUN} ${BC_DEBUGGER} ${PROJECT_EXECUTABLE} + ${BC_DEBUGGER} ${PROJECT_EXECUTABLE}