summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-03-30 14:37:10 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-03-30 14:37:10 +0200
commita1369c9e30973aa610c30800380f2f8c197da633 (patch)
treef0c203327a361330d0badfacbed5ecce3b011d16
parentfadbc9808c682c1c9cc7af89a35d2e4fa3faa6dc (diff)
Added dependency, so generation task wait for genie to be built (nw)
-rw-r--r--makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/makefile b/makefile
index 472eed81edf..65c155c3b2f 100644
--- a/makefile
+++ b/makefile
@@ -441,7 +441,7 @@ regenie:
# gmake-mingw64-gcc
#-------------------------------------------------
-$(PROJECTDIR)/gmake-mingw64-gcc/Makefile: makefile $(SCRIPTS)
+$(PROJECTDIR)/gmake-mingw64-gcc/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef MINGW64
$(error MINGW64 is not set)
endif
@@ -458,7 +458,7 @@ windows_x64: generate $(PROJECTDIR)/gmake-mingw64-gcc/Makefile
.PHONY: windows
windows: windows_x86
-$(PROJECTDIR)/gmake-mingw32-gcc/Makefile: makefile $(SCRIPTS)
+$(PROJECTDIR)/gmake-mingw32-gcc/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef MINGW32
$(error MINGW32 is not set)
endif
@@ -472,7 +472,7 @@ windows_x86: generate $(PROJECTDIR)/gmake-mingw32-gcc/Makefile
# gmake-mingw-clang
#-------------------------------------------------
-$(PROJECTDIR)/gmake-mingw-clang/Makefile: makefile $(SCRIPTS)
+$(PROJECTDIR)/gmake-mingw-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef CLANG
$(error CLANG is not set)
endif
@@ -598,7 +598,7 @@ endif
# gmake-linux
#-------------------------------------------------
-$(PROJECTDIR)/gmake-linux/Makefile: makefile $(SCRIPTS)
+$(PROJECTDIR)/gmake-linux/Makefile: makefile $(SCRIPTS) $(GENIE)
$(SILENT) $(GENIE) $(PARAMS) --gcc=linux-gcc --gcc_version=$(GCC_VERSION) gmake
.PHONY: linux_x64
@@ -616,7 +616,7 @@ linux_x86: generate $(PROJECTDIR)/gmake-linux/Makefile
# gmake-linux-clang
#-------------------------------------------------
-$(PROJECTDIR)/gmake-linux-clang/Makefile: makefile $(SCRIPTS)
+$(PROJECTDIR)/gmake-linux-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
$(SILENT) $(GENIE) $(PARAMS) --gcc=linux-clang --gcc_version=$(CLANG_VERSION) gmake
.PHONY: linux_x64_clang
@@ -631,7 +631,7 @@ linux_x86_clang: generate $(PROJECTDIR)/gmake-linux-clang/Makefile
# gmake-osx
#-------------------------------------------------
-$(PROJECTDIR)/gmake-osx/Makefile: makefile $(SCRIPTS)
+$(PROJECTDIR)/gmake-osx/Makefile: makefile $(SCRIPTS) $(GENIE)
$(SILENT) $(GENIE) $(PARAMS) --gcc=osx --os_version=$(DARWIN_VERSION) --gcc_version=$(GCC_VERSION) gmake
.PHONY: macosx_x64
@@ -649,7 +649,7 @@ macosx_x86: generate $(PROJECTDIR)/gmake-osx/Makefile
# gmake-osx-clang
#-------------------------------------------------
-$(PROJECTDIR)/gmake-osx-clang/Makefile: makefile $(SCRIPTS)
+$(PROJECTDIR)/gmake-osx-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
$(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --os_version=$(DARWIN_VERSION) --gcc_version=$(CLANG_VERSION) gmake
.PHONY: macosx_x64_clang