drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 12 Activity

[nostalgia][buildcore] Put vcpkg pkgs in variable

Browse Source
This commit is contained in:
Gary Talent
2021-03-02 21:32:00 -06:00
parent ca4b9f7bdc
commit e52ac1f78c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
deps/buildcore/base.mk vendored
View File

@ -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