summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-11-14 11:52:15 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-11-14 11:52:15 +0100
commit8c0d01d4266e47ec918698fce4d39eb3a5a4c152 (patch)
treef4d00d6e9e211b40b9547c932d6e55bdd714f1bd /makefile
parent71ceab74c54ccabee7a5d82f20c443af07683166 (diff)
Fix compile for Intel C++ 15 compiler (nw)
Diffstat (limited to 'makefile')
-rw-r--r--makefile12
1 files changed, 12 insertions, 0 deletions
diff --git a/makefile b/makefile
index b78ece4d18c..f715cba3ba8 100644
--- a/makefile
+++ b/makefile
@@ -846,6 +846,18 @@ vs2013_winrt: generate
vs2015: generate
$(SILENT) $(GENIE) $(PARAMS) vs2015
+vs2015_intel: generate
+ $(SILENT) $(GENIE) $(PARAMS) --vs=intel-15 vs2015
+
+vs2015_xp: generate
+ $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-xp vs2015
+
+vs2015_clang: generate
+ $(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-clang vs2015
+
+vs2015_winrt: generate
+ $(SILENT) $(GENIE) $(PARAMS) --vs=winstore81 vs2015
+
android-arm: generate
ifndef ANDROID_NDK_ARM
$(error ANDROID_NDK_ARM is not set)