diff options
author | Vas Crabb <vas@vastheman.com> | 2015-11-02 22:37:01 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2015-11-02 23:40:03 +1100 |
commit | 8247cab5583ef4a8e916975d36948a2e51c37a11 (patch) | |
tree | 116e6c6c6a616a0e33523063ed467dd8c8b71907 /makefile | |
parent | a780714451f387a4e594e96408ab2906c638fb1a (diff) |
make it easier to build multiple configs (nw)
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 27 |
1 files changed, 20 insertions, 7 deletions
@@ -69,6 +69,7 @@ # MACOSX_USE_LIBSDL = 1 # CYGWIN_BUILD = 1 +# BUILDDIR = build # TARGETOS = windows # CROSS_BUILD = 1 # OVERRIDE_CC = cc @@ -94,7 +95,11 @@ # FORCE_VERSION_COMPILE = 1 +ifdef PREFIX_MAKEFILE +include $(PREFIX_MAKEFILE) +else -include useroptions.mak +endif ########################################################################### ################## END USER-CONFIGURABLE OPTIONS ###################### @@ -182,6 +187,10 @@ SILENT := @ MAKEPARAMS += --no-print-directory endif +ifndef BUILDDIR +BUILDDIR := build +endif + #------------------------------------------------- # specify OS target, which further differentiates # the underlying OS; supported values are: @@ -504,6 +513,10 @@ ifdef OSD PARAMS += --osd='$(OSD)' endif +ifdef BUILDDIR +PARAMS += --build-dir='$(BUILDDIR)' +endif + ifdef TARGETOS PARAMS += --targetos='$(TARGETOS)' endif @@ -702,7 +715,7 @@ else COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))" endif -GENDIR = build/generated +GENDIR = $(BUILDDIR)/generated # all sources are under the src/ directory SRC = src @@ -743,7 +756,7 @@ SUBDIR := $(OSD)/$(TARGET) else SUBDIR := $(OSD)/$(TARGET)$(SUBTARGET) endif -PROJECTDIR := build/projects/$(SUBDIR) +PROJECTDIR := $(BUILDDIR)/projects/$(SUBDIR) .PHONY: all clean regenie generate all: $(GENIE) $(TARGETOS)$(ARCHITECTURE) @@ -1074,7 +1087,7 @@ $(GENIE): $(GENIE_SRC) clean: @echo Cleaning... - -@rm -rf build + -@rm -rf $(BUILDDIR) $(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/genie/build/gmake.$(GENIEOS) -f genie.make clean GEN_FOLDERS := $(GENDIR)/$(TARGET)/layout/ $(GENDIR)/$(TARGET)/$(SUBTARGET)/ @@ -1167,13 +1180,13 @@ ifndef USE_SYSTEM_LIB_LUA CPPCHECK_PARAMS += -I3rdparty/lua/src endif ifndef USE_SYSTEM_LIB_ZLIB -CPPCHECK_PARAMS += -I3rdparty/zlib +CPPCHECK_PARAMS += -I3rdparty/zlib endif CPPCHECK_PARAMS += -I3rdparty/bgfx/include CPPCHECK_PARAMS += -I3rdparty/bx/include -CPPCHECK_PARAMS += -Ibuild/generated/emu -CPPCHECK_PARAMS += -Ibuild/generated/emu/layout -CPPCHECK_PARAMS += -Ibuild/generated/mame/layout +CPPCHECK_PARAMS += -I$(BUILDDIR)/generated/emu +CPPCHECK_PARAMS += -I$(BUILDDIR)/generated/emu/layout +CPPCHECK_PARAMS += -I$(BUILDDIR)/generated/mame/layout CPPCHECK_PARAMS += -DX64_WINDOWS_ABI CPPCHECK_PARAMS += -DPTR64=1 CPPCHECK_PARAMS += -DMAME_DEBUG |