From e17ba1e17a1bb35809b11a18352d21d6f93fcb70 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 24 Aug 2023 00:05:00 -0500 Subject: [PATCH] Update Makefile for buildcore update --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c4d3b59..1868f99 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,17 @@ -PROJECT_NAME=CppProject +BC_PROJECT_NAME=CppProject +BC_VCPKG_PKGS= BUILDCORE_PATH=deps/buildcore -VCPKG_PKGS= include ${BUILDCORE_PATH}/base.mk -ifeq ($(OS),darwin) - PROJECT_EXECUTABLE=./build/${CURRENT_BUILD}/${PROJECT_NAME}.app/Contents/MacOS/${PROJECT_NAME} +ifeq ($(BC_OS),darwin) + PROJECT_EXECUTABLE=./build/${BC_CURRENT_BUILD}/${BC_PROJECT_NAME}.app/Contents/MacOS/${BC_PROJECT_NAME} else - PROJECT_EXECUTABLE=./build/${CURRENT_BUILD}/bin/${PROJECT_NAME} + PROJECT_EXECUTABLE=./build/${BC_CURRENT_BUILD}/bin/${BC_PROJECT_NAME} endif .PHONY: run run: build - ${ENV_RUN} ${PROJECT_EXECUTABLE} + ${BC_ENVRUN} ${PROJECT_EXECUTABLE} .PHONY: debug debug: build - ${ENV_RUN} ${DEBUGGER} ${PROJECT_EXECUTABLE} + ${BC_ENVRUN} ${BC_DEBUGGER} ${PROJECT_EXECUTABLE}