Update Makefile and .gitignore

.gitignore

@@ -3,7 +3,9 @@ build/gba
 build/*-asan
 build/*-debug
 build/*-release
+.current_build
 tags
+compile_commands.json
 conanbuildinfo.cmake
 conanbuildinfo.txt
 conaninfo.txt

Makefile

@@ -1,68 +1,18 @@
-OS=$(shell uname | tr [:upper:] [:lower:])
+BC_VAR_PROJECT_NAME=ox
-HOST_ENV=${OS}-$(shell uname -m)
+BC_VAR_PROJECT_NAME_CAP=Ox
-DEVENV=devenv$(shell pwd | sed 's/\//-/g')
+BC_VAR_DEVENV_ROOT=util
-DEVENV_IMAGE=wombatant/devenv
+BUILDCORE_PATH=deps/buildcore
-ifneq ($(shell which docker 2>&1),)
+include ${BUILDCORE_PATH}/base.mk
-	ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
-		ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
-	endif
-endif
 
-all:
+.PHONY: git-setup-buildcore-remote
-	${ENV_RUN} ./scripts/run-make build
+git-setup-buildcore-remote:
-preinstall:
+	git remote add -f buildcore-master git@git.drinkingtea.net:drinkingtea/buildcore.git
-	${ENV_RUN} ./scripts/run-make build preinstall
-install:
-	${ENV_RUN} ./scripts/run-make build install
-clean:
-	${ENV_RUN} ./scripts/run-make build clean
-purge:
-	${ENV_RUN} rm -rf build
-test:
-	${ENV_RUN} ./scripts/run-make build test
 
-devenv:
+.PHONY: git-pull-buildcore
-	docker pull ${DEVENV_IMAGE}
+git-pull-buildcore:
-	docker run -d -v $(shell pwd):/usr/src/project \
+	git fetch buildcore-master master
-		-e LOCAL_USER_ID=$(shell id -u ${USER}) \
+	git subtree pull --prefix deps/buildcore buildcore-master master --squash
-		--name ${DEVENV} -t ${DEVENV_IMAGE} bash
-devenv-destroy:
-	docker rm -f ${DEVENV}
-devenv-shell:
-	${ENV_RUN} bash
 
-configure-release:
+.PHONY: git-push-buildcore
-	${ENV_RUN} rm -rf build/${HOST_ENV}-release
+git-push-buildcore:
-	${ENV_RUN} ./scripts/setup_build ${HOST_ENV}
+	git subtree push --prefix=deps/buildcore buildcore-master master
-	${ENV_RUN} rm -f build/current
-	${ENV_RUN} ln -s ${HOST_ENV}-release build/current
-
-configure-debug:
-	${ENV_RUN} rm -rf build/${HOST_ENV}-debug
-	${ENV_RUN} ./scripts/setup_build ${HOST_ENV} debug
-	${ENV_RUN} rm -f build/current
-	${ENV_RUN} ln -s ${HOST_ENV}-debug build/current
-
-configure-asan:
-	${ENV_RUN} rm -rf build/${HOST_ENV}-asan
-	${ENV_RUN} ./scripts/setup_build ${HOST_ENV} asan
-	${ENV_RUN} rm -f build/current
-	${ENV_RUN} ln -s ${HOST_ENV}-asan build/current
-
-configure-windows:
-	${ENV_RUN} rm -rf build/windows
-	${ENV_RUN} ./scripts/setup_build windows
-	${ENV_RUN} rm -f build/current
-	${ENV_RUN} ln -s windows build/current
-
-configure-windows-debug:
-	${ENV_RUN} rm -rf build/windows
-	${ENV_RUN} ./scripts/setup_build windows debug
-	${ENV_RUN} rm -f build/current
-	${ENV_RUN} ln -s windows build/current
-
-configure-gba:
-	${ENV_RUN} rm -rf build/gba-release
-	${ENV_RUN} ./scripts/setup_build gba
-	${ENV_RUN} rm -f build/current
-	${ENV_RUN} ln -s gba-release build/current