From 834a36c41786b93a131574888a645721b166b970 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Tue, 29 Oct 2024 23:45:31 -0500
Subject: [PATCH] Fix make run for new buildcore

---
 CMakeLists.txt | 4 ++++
 Makefile       | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43e92bf..57c4f91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,10 @@ if(NOT MSVC)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion")
 endif()
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 set(CMAKE_INSTALL_RPATH "$ORIGIN" "$ORIGIN/../")
 if(QTDIR)
 	set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} "${QTDIR}/lib")
diff --git a/Makefile b/Makefile
index 7997bc8..7772c93 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,14 @@ VCPKG_PKGS=
 include ${BUILDCORE_PATH}/base.mk
 
 ifeq ($(OS),darwin)
-	PROJECT_EXECUTABLE=./dist/${CURRENT_BUILD}/${PROJECT_NAME}.app/Contents/MacOS/SlideController
+	PROJECT_EXECUTABLE=./build/${BC_VAR_CURRENT_BUILD}/${PROJECT_NAME}.app/Contents/MacOS/SlideController
 else
-	PROJECT_EXECUTABLE=./dist/${CURRENT_BUILD}/bin/SlideController
+	PROJECT_EXECUTABLE=./build/${BC_VAR_CURRENT_BUILD}/bin/SlideController
 endif
 
 .PHONY: run
-run: install
+run:
 	${ENV_RUN} ${PROJECT_EXECUTABLE}
 .PHONY: debug
-debug: install
+debug:
 	${DEBUGGER} ${PROJECT_EXECUTABLE}