From 806325d649f2dd4702289a96ac4551aaebb5356c Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 18 May 2017 16:39:33 -0500 Subject: [PATCH] Fix to build on FreeBSD --- Makefile | 19 ++++++++++++------- build/Makefile | 6 +++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d24220e2..a9ec10cb 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,11 @@ OS=$(shell uname | tr [:upper:] [:lower:]) HOST_ENV=${OS}-$(shell uname -m) DEVENV=devenv$(shell pwd | sed 's/\//-/g') DEVENV_IMAGE=nostalgia-devenv +ifneq ($(shell which gmake),) + MAKE=gmake +else + MAKE=make +endif ifneq ($(shell which docker),) ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running) ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV} @@ -9,21 +14,21 @@ ifneq ($(shell which docker),) endif make: - ${ENV_RUN} make -j -C build HOST_ENV=${HOST_ENV} + ${ENV_RUN} ${MAKE} -j -C build HOST_ENV=${HOST_ENV} build_rom: - ${ENV_RUN} make -j -C build ARGS="install" HOST_ENV=${HOST_ENV} - ${ENV_RUN} make -j -C build HOST_ENV=${HOST_ENV} + ${ENV_RUN} ${MAKE} -j -C build ARGS="install" HOST_ENV=${HOST_ENV} + ${ENV_RUN} ${MAKE} -j -C build HOST_ENV=${HOST_ENV} ${ENV_RUN} ./scripts/build_rom.sh 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: - ${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: - ${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: ${ENV_RUN} rm -rf $$(find build -mindepth 1 -maxdepth 1 -type d) dist 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: install ./dist/current/bin/nostalgia -debug diff --git a/build/Makefile b/build/Makefile index 60d82c58..804953d7 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,6 +1,10 @@ all: gba_build gba_debug_build native_build native_debug_build windows_release windows_debug -MAKE=make -j +ifneq ($(shell which gmake),) + MAKE="gmake -j" +else + MAKE="make -j" +endif gba_build: @if [ -d gba-release ]; then \