summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
Diffstat (limited to 'makefile')
-rw-r--r--makefile21
1 files changed, 19 insertions, 2 deletions
diff --git a/makefile b/makefile
index 573ebbba22e..71a5b6b1e5c 100644
--- a/makefile
+++ b/makefile
@@ -505,8 +505,10 @@ endif
# reverse logic for this one
ifdef USE_BUNDLED_LIB_SDL2
+ifneq '$(USE_BUNDLED_LIB_SDL2)' '0'
PARAMS += --with-bundled-sdl2
endif
+endif
#-------------------------------------------------
# distribution may change things
@@ -971,7 +973,11 @@ FASTBUILD_PARAMS += $(FASTBUILD_TARGET)-x32
endif
endif
else
+ifdef OVERRIDE_CC
+GCC_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(OVERRIDE_CC)) -dumpversion 2> /dev/null)
+else
GCC_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> /dev/null)
+endif
ifneq ($(OS),solaris)
CLANG_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/null | head -n 1 | grep -e 'version [0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | grep -e '[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | tail -n 1)
endif
@@ -1168,6 +1174,17 @@ ifdef FASTBUILD
endif
#-------------------------------------------------
+# Visual Studio LLVM
+#-------------------------------------------------
+
+.PHONY: vsllvm
+vsllvm: generate
+ $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vsllvm
+ifdef MSBUILD
+ $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vsllvm/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
+endif
+
+#-------------------------------------------------
# android-ndk
#-------------------------------------------------
@@ -1608,14 +1625,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo '#define BARE_BUILD_VERSION "0.205"' > $@
+ @echo '#define BARE_BUILD_VERSION "0.207"' > $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc
- @echo #define BARE_BUILD_VERSION "0.205" > $@
+ @echo #define BARE_BUILD_VERSION "0.207" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@