diff --git a/deps/ox/Makefile b/deps/ox/Makefile index a5c54554..96fd4412 100644 --- a/deps/ox/Makefile +++ b/deps/ox/Makefile @@ -2,11 +2,6 @@ OS=$(shell uname | tr [:upper:] [:lower:]) HOST_ENV=${OS}-$(shell uname -m) DEVENV=devenv$(shell pwd | sed 's/\//-/g') DEVENV_IMAGE=wombatant/devenv -ifneq ($(shell which gmake),) - MAKE=gmake -s -else - MAKE=make -s -endif ifneq ($(shell which docker 2>&1),) ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running) ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV} @@ -14,17 +9,17 @@ ifneq ($(shell which docker 2>&1),) endif make: - ${ENV_RUN} ${MAKE} -j -C build HOST_ENV=${HOST_ENV} + ${ENV_RUN} ./scripts/run-make build preinstall: - ${ENV_RUN} ${MAKE} -j -C build ARGS="preinstall" HOST_ENV=${HOST_ENV} + ${ENV_RUN} ./scripts/run-make build preinstall install: - ${ENV_RUN} ${MAKE} -j -C build ARGS="install" HOST_ENV=${HOST_ENV} + ${ENV_RUN} ./scripts/run-make build install clean: - ${ENV_RUN} ${MAKE} -j -C build ARGS="clean" HOST_ENV=${HOST_ENV} + ${ENV_RUN} ./scripts/run-make build clean purge: ${ENV_RUN} rm -rf $(shell find build -mindepth 1 -maxdepth 1 -type d) test: - ${ENV_RUN} ${MAKE} -j -C build ARGS="test" HOST_ENV=${HOST_ENV} + ${ENV_RUN} ./scripts/run-make build test devenv: docker pull ${DEVENV_IMAGE} @@ -53,7 +48,7 @@ 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}-debug build/current + ${ENV_RUN} ln -s ${HOST_ENV}-asan build/current windows: ${ENV_RUN} rm -rf build/windows diff --git a/deps/ox/build/Makefile b/deps/ox/build/Makefile deleted file mode 100644 index c18e1165..00000000 --- a/deps/ox/build/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -all: gba_build native_build native_debug_build native_asan_build windows_release windows_debug - -gba_build: - @if [ -d gba-release ]; then \ - cmake --build gba-release --target ${ARGS}; \ - fi - -native_build: - @if [ -d ${HOST_ENV}-release ]; then \ - cmake --build ${HOST_ENV}-release --target ${ARGS}; \ - fi - -native_debug_build: - @if [ -d ${HOST_ENV}-debug ]; then \ - cmake --build ${HOST_ENV}-debug --target ${ARGS}; \ - fi - -native_asan_build: - @if [ -d ${HOST_ENV}-asan ]; then \ - cmake --build ${HOST_ENV}-asan --target ${ARGS}; \ - fi - -windows_release: - @if [ -d windows-release ]; then \ - cmake --build windows-release --target ${ARGS}; \ - fi - -windows_debug: - @if [ -d windows-debug ]; then \ - cmake --build windows-debug --target ${ARGS}; \ - fi diff --git a/deps/ox/scripts/run-make b/deps/ox/scripts/run-make new file mode 100755 index 00000000..072865b7 --- /dev/null +++ b/deps/ox/scripts/run-make @@ -0,0 +1,8 @@ +#! /usr/bin/env bash + +set -e + +for f in $(find $1 -maxdepth 1 -mindepth 1 -type d) +do + cmake --build "$f" --target $2 -- +done