From e52ac1f78c86b0eaffad35c1df7daa4f38dd73df Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Tue, 2 Mar 2021 21:32:00 -0600
Subject: [PATCH] [nostalgia][buildcore] Put vcpkg pkgs in variable

---
 Makefile               | 6 +++---
 deps/buildcore/base.mk | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7e03a95f..88425b6f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PROJECT_NAME=nostalgia
-VCPKG_VERSION=2020.06
 BUILDCORE_PATH=deps/buildcore
+VCPKG_PKGS=sdl2 jsoncpp
 include ${BUILDCORE_PATH}/base.mk
 
 ifeq ($(OS),darwin)
@@ -25,10 +25,10 @@ run-studio: install
 .PHONY: gba-run
 gba-run: pkg-gba
 	${MGBA} nostalgia.gba
-.PHONY: gdb
+.PHONY: debug
 debug: install
 	${ENV_RUN} gdb --args ./dist/${CURRENT_BUILD}/bin/nostalgia sample_project
-.PHONY: gdb-studio
+.PHONY: debug-studio
 debug-studio: install
 	${ENV_RUN} gdb --args ${NOSTALGIA_STUDIO}
 
diff --git a/deps/buildcore/base.mk b/deps/buildcore/base.mk
index c733693d..3bb9e9eb 100644
--- a/deps/buildcore/base.mk
+++ b/deps/buildcore/base.mk
@@ -20,6 +20,9 @@ RM_RF=${PYBB} rm
 ifndef VCPKG_DIR_BASE
 	VCPKG_DIR_BASE=.vcpkg
 endif
+ifndef VCPKG_VERSION
+	VCPKG_VERSION=2020.06
+endif
 VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV)
 DEVENV=devenv$(shell pwd | sed 's/\//-/g')
 DEVENV_IMAGE=${PROJECT_NAME}-devenv
@@ -87,9 +90,9 @@ endif
 .PHONY: vcpkg-install
 vcpkg-install:
 ifneq (${OS},windows)
-	${VCPKG_DIR}/vcpkg install sdl2 jsoncpp
+	${VCPKG_DIR}/vcpkg install ${VCPKG_PKGS}
 else
-	${VCPKG_DIR}/vcpkg install --triplet x64-windows sdl2 jsoncpp
+	${VCPKG_DIR}/vcpkg install --triplet x64-windows ${VCPKG_PKGS}
 endif
 
 .PHONY: configure-xcode