drinkingtea/buildcore
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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 c2af634691
commit 8cc8fd882e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base.mk
+5 -2
View File
@@ -20,6 +20,9 @@ RM_RF=${PYBB} rm
ifndef VCPKG_DIR_BASE ifndef VCPKG_DIR_BASE
VCPKG_DIR_BASE=.vcpkg VCPKG_DIR_BASE=.vcpkg
endif endif
ifndef VCPKG_VERSION
VCPKG_VERSION=2020.06
endif
VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV) VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV)
DEVENV=devenv$(shell pwd | sed 's/\//-/g') DEVENV=devenv$(shell pwd | sed 's/\//-/g')
DEVENV_IMAGE=${PROJECT_NAME}-devenv DEVENV_IMAGE=${PROJECT_NAME}-devenv
@@ -87,9 +90,9 @@ endif
.PHONY: vcpkg-install .PHONY: vcpkg-install
vcpkg-install: vcpkg-install:
ifneq (${OS},windows) ifneq (${OS},windows)
${VCPKG_DIR}/vcpkg install sdl2 jsoncpp ${VCPKG_DIR}/vcpkg install ${VCPKG_PKGS}
else else
${VCPKG_DIR}/vcpkg install --triplet x64-windows sdl2 jsoncpp ${VCPKG_DIR}/vcpkg install --triplet x64-windows ${VCPKG_PKGS}
endif endif
.PHONY: configure-xcode .PHONY: configure-xcode