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

[nostalgia] Make current build always use current platform

Browse Source
This commit is contained in:
Gary Talent
2020-08-14 20:47:30 -05:00
parent 4ec7f2a24e
commit 72380b0190
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -2,8 +2,8 @@ OS=$(shell uname | tr [:upper:] [:lower:])
HOST_ENV=${OS}-$(shell uname -m) HOST_ENV=${OS}-$(shell uname -m)
DEVENV=devenv$(shell pwd | sed 's/\//-/g') DEVENV=devenv$(shell pwd | sed 's/\//-/g')
DEVENV_IMAGE=nostalgia-devenv DEVENV_IMAGE=nostalgia-devenv
VCPKG_DIR=./.vcpkg-${HOST_ENV}/ VCPKG_DIR=./.vcpkg-$(HOST_ENV)/
CURRENT_BUILD=$(file < .current_build) CURRENT_BUILD=$(HOST_ENV)-$(file < .current_build)
ifneq ($(shell which docker 2> /dev/null),) ifneq ($(shell which docker 2> /dev/null),)
ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running) ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV} ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}

2
scripts/setup-build
View File

@@ -47,7 +47,7 @@ cmake -S $project -B $buildDir -GNinja \
mkdir -p dist mkdir -p dist
if [[ $target != gba ]] && [[ $target != gba-debug ]]; then if [[ $target != gba ]] && [[ $target != gba-debug ]]; then
echo ${buildConfig} > .current_build echo ${buildType} > .current_build
fi fi
rm -f compile_commands.json rm -f compile_commands.json
ln -s build/${buildConfig}/compile_commands.json ln -s build/${buildConfig}/compile_commands.json