drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,6 +1,6 @@
PROJECT_NAME=nostalgia PROJECT_NAME=nostalgia
VCPKG_VERSION=2020.06
BUILDCORE_PATH=deps/buildcore BUILDCORE_PATH=deps/buildcore
VCPKG_PKGS=sdl2 jsoncpp
include ${BUILDCORE_PATH}/base.mk include ${BUILDCORE_PATH}/base.mk
ifeq ($(OS),darwin) ifeq ($(OS),darwin)
@ -25,10 +25,10 @@ run-studio: install
.PHONY: gba-run .PHONY: gba-run
gba-run: pkg-gba gba-run: pkg-gba
${MGBA} nostalgia.gba ${MGBA} nostalgia.gba
.PHONY: gdb .PHONY: debug
debug: install debug: install
${ENV_RUN} gdb --args ./dist/${CURRENT_BUILD}/bin/nostalgia sample_project ${ENV_RUN} gdb --args ./dist/${CURRENT_BUILD}/bin/nostalgia sample_project
.PHONY: gdb-studio .PHONY: debug-studio
debug-studio: install debug-studio: install
${ENV_RUN} gdb --args ${NOSTALGIA_STUDIO} ${ENV_RUN} gdb --args ${NOSTALGIA_STUDIO}

7
deps/buildcore/base.mk vendored
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