summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-03-23 09:11:38 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-03-23 09:11:38 +0100
commit6e5dc7208013fd1b61604ed4856b1a9c42b94a12 (patch)
tree1b93d478a4179117aa17ef81c8de1ce52d8c62c0
parent1054cfe7fd9311940545a300c4032906da3dd1b5 (diff)
Updated makefile to support more building environments and to prevent crashing if folders are missing (nw)
-rw-r--r--makefile14
1 files changed, 13 insertions, 1 deletions
diff --git a/makefile b/makefile
index b71fc5f96cb..53cde5f4948 100644
--- a/makefile
+++ b/makefile
@@ -185,6 +185,13 @@ $(error Unable to detect OS from uname -a: $(UNAME))
endif
endif
+MINGW:=
+ifdef MINGW64
+ MINGW := $(MINGW64)
+else
+ MINGW := $(MINGW32)
+endif
+
#-------------------------------------------------
# specify core target: mame, ldplayer
# specify subtarget: mame, arcade, mess, tiny, etc.
@@ -1514,9 +1521,14 @@ cppcheck:
.PHONY: shaders bgfx-tools
bgfx-tools:
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/bgfx -f makefile dist-$(GENIEOS)
+ $(SILENT) $(MAKE) -C 3rdparty/bgfx -f makefile dist-$(GENIEOS) CC="$(CC)" CXX="$(CXX)" MINGW="$(MINGW)"
shaders: bgfx-tools
+ -$(call MKDIR,build/bgfx/shaders/dx11)
+ -$(call MKDIR,build/bgfx/shaders/dx9)
+ -$(call MKDIR,build/bgfx/shaders/gles)
+ -$(call MKDIR,build/bgfx/shaders/glsl)
+ -$(call MKDIR,build/bgfx/shaders/metal)
$(SILENT) $(MAKE) -C $(SRC)/osd/modules/render/bgfx rebuild
#-------------------------------------------------