[nostalgia] Make current build always use current platform
This commit is contained in:
parent
4ec7f2a24e
commit
72380b0190
4
Makefile
4
Makefile
@ -2,8 +2,8 @@ OS=$(shell uname | tr [:upper:] [:lower:])
|
||||
HOST_ENV=${OS}-$(shell uname -m)
|
||||
DEVENV=devenv$(shell pwd | sed 's/\//-/g')
|
||||
DEVENV_IMAGE=nostalgia-devenv
|
||||
VCPKG_DIR=./.vcpkg-${HOST_ENV}/
|
||||
CURRENT_BUILD=$(file < .current_build)
|
||||
VCPKG_DIR=./.vcpkg-$(HOST_ENV)/
|
||||
CURRENT_BUILD=$(HOST_ENV)-$(file < .current_build)
|
||||
ifneq ($(shell which docker 2> /dev/null),)
|
||||
ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
|
||||
ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
|
||||
|
@ -47,7 +47,7 @@ cmake -S $project -B $buildDir -GNinja \
|
||||
|
||||
mkdir -p dist
|
||||
if [[ $target != gba ]] && [[ $target != gba-debug ]]; then
|
||||
echo ${buildConfig} > .current_build
|
||||
echo ${buildType} > .current_build
|
||||
fi
|
||||
rm -f compile_commands.json
|
||||
ln -s build/${buildConfig}/compile_commands.json
|
||||
|
Loading…
Reference in New Issue
Block a user