From 8cc8fd882e575b2224353649e896a005e50c9560 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 2 Mar 2021 21:32:00 -0600 Subject: [PATCH] [nostalgia][buildcore] Put vcpkg pkgs in variable --- base.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/base.mk b/base.mk index c733693..3bb9e9e 100644 --- a/base.mk +++ b/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