drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Merge branch 'master' of github.com:wombatant/ox

Browse Source
This commit is contained in:
Gary Talent
2017-04-25 22:01:34 -05:00
parent 52f326f96c 7b58d2ef06
commit 493c59fa5e
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+14 -7
View File
@@ -2,22 +2,29 @@ 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=wombatant/devenv DEVENV_IMAGE=wombatant/devenv
ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running) ifneq ($(shell which gmake),)
ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV} MAKE=gmake
else
MAKE=make
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}
endif
endif endif
make: make:
${ENV_RUN} make -j -C build HOST_ENV=${HOST_ENV} ${ENV_RUN} ${MAKE} -j -C build HOST_ENV=${HOST_ENV}
preinstall: preinstall:
${ENV_RUN} make -j -C build ARGS="preinstall" HOST_ENV=${HOST_ENV} ${ENV_RUN} ${MAKE} -j -C build ARGS="preinstall" HOST_ENV=${HOST_ENV}
install: install:
${ENV_RUN} make -j -C build ARGS="install" HOST_ENV=${HOST_ENV} ${ENV_RUN} ${MAKE} -j -C build ARGS="install" HOST_ENV=${HOST_ENV}
clean: clean:
${ENV_RUN} make -j -C build ARGS="clean" HOST_ENV=${HOST_ENV} ${ENV_RUN} ${MAKE} -j -C build ARGS="clean" HOST_ENV=${HOST_ENV}
purge: purge:
${ENV_RUN} rm -rf $(shell find build -mindepth 1 -maxdepth 1 -type d) ${ENV_RUN} rm -rf $(shell find build -mindepth 1 -maxdepth 1 -type d)
test: test:
${ENV_RUN} make -j -C build ARGS="test" HOST_ENV=${HOST_ENV} ${ENV_RUN} ${MAKE} -j -C build ARGS="test" HOST_ENV=${HOST_ENV}
run: make run: make
./build/current/src/wombat/wombat -debug ./build/current/src/wombat/wombat -debug
gdb: make gdb: make
build/Makefile
+6 -2
View File
@@ -1,6 +1,10 @@
all: gba_build native_build native_debug_build windows_release windows_debug ifneq ($(shell which gmake),)
MAKE=gmake -j
else
MAKE=make
endif
MAKE=make -j all: gba_build native_build native_debug_build windows_release windows_debug
gba_build: gba_build:
@if [ -d gba-release ]; then \ @if [ -d gba-release ]; then \