From 2582ce7f16cc84c686a4357fca7d53edd0ecc348 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 26 Feb 2016 14:16:50 +0100 Subject: [PATCH] cleanup (nw) --- makefile | 103 +++++++++++++++++++++++++++++++++++----------- scripts/genie.lua | 2 +- 2 files changed, 79 insertions(+), 26 deletions(-) diff --git a/makefile b/makefile index de142731b31..7671600b4df 100644 --- a/makefile +++ b/makefile @@ -876,6 +876,10 @@ windows_x86_clang: generate $(PROJECTDIR)/gmake-mingw-clang/Makefile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES) precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES) +#------------------------------------------------- +# Visual Studio 2013 +#------------------------------------------------- + .PHONY: vs2013 vs2013: generate $(SILENT) $(GENIE) $(PARAMS) --osd=windows --targetos=windows vs2013 @@ -897,6 +901,10 @@ ifdef MSBUILD $(SILENT) msbuild $(PROJECTDIR_WIN)/vs2013-xp/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) endif +#------------------------------------------------- +# Visual Studio 2015 +#------------------------------------------------- + .PHONY: vs2015 vs2015: generate $(SILENT) $(GENIE) $(PARAMS) --osd=windows --targetos=windows vs2015 @@ -918,66 +926,110 @@ ifdef MSBUILD $(SILENT) msbuild $(PROJECTDIR_WIN)/vs2015-xp/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) endif -.PHONY: android-arm -android-arm: generate +#------------------------------------------------- +# android-arm +#------------------------------------------------- + +$(PROJECTDIR_MINI)/gmake-android-arm/Makefile: makefile $(SCRIPTS) $(GENIE) ifndef ANDROID_NDK_ARM $(error ANDROID_NDK_ARM is not set) endif ifndef ANDROID_NDK_ROOT $(error ANDROID_NDK_ROOT is not set) endif -ifndef COMPILE - $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=4.9 --osd=osdmini --targetos=android-arm --targetos=android --PLATFORM=arm --NOASM=1 gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=3.6.0 --osd=osdmini --targetos=android-arm --targetos=android --PLATFORM=arm --NOASM=1 gmake + +.PHONY: android-arm +android-arm: generate $(PROJECTDIR_MINI)/gmake-android-arm/Makefile +ifndef ANDROID_NDK_ARM + $(error ANDROID_NDK_ARM is not set) endif +ifndef ANDROID_NDK_ROOT + $(error ANDROID_NDK_ROOT is not set) +endif $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-arm config=$(CONFIG) precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-arm config=$(CONFIG) -.PHONY: android-mips -android-mips: generate +#------------------------------------------------- +# android-mips +#------------------------------------------------- + +$(PROJECTDIR_MINI)/gmake-android-mips/Makefile: makefile $(SCRIPTS) $(GENIE) ifndef ANDROID_NDK_MIPS $(error ANDROID_NDK_MIPS is not set) endif ifndef ANDROID_NDK_ROOT $(error ANDROID_NDK_ROOT is not set) endif -ifndef COMPILE - $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=4.9 --osd=osdmini --targetos=android-mips --targetos=android --PLATFORM=mips --NOASM=1 gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=3.6.0 --osd=osdmini --targetos=android-mips --targetos=android --PLATFORM=mips --NOASM=1 gmake + +.PHONY: android-mips +android-mips: generate $(PROJECTDIR_MINI)/gmake-android-mips/Makefile +ifndef ANDROID_NDK_MIPS + $(error ANDROID_NDK_MIPS is not set) +endif +ifndef ANDROID_NDK_ROOT + $(error ANDROID_NDK_ROOT is not set) endif $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-mips config=$(CONFIG) precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-mips config=$(CONFIG) -.PHONY: android-x86 -android-x86: generate +#------------------------------------------------- +# android-x86 +#------------------------------------------------- + +$(PROJECTDIR_MINI)/gmake-android-x86/Makefile: makefile $(SCRIPTS) $(GENIE) ifndef ANDROID_NDK_X86 $(error ANDROID_NDK_X86 is not set) endif ifndef ANDROID_NDK_ROOT $(error ANDROID_NDK_ROOT is not set) endif -ifndef COMPILE - $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=4.9 --osd=osdmini --targetos=android-x86 --targetos=android --PLATFORM=x86 gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=3.6.0 --osd=osdmini --targetos=android-x86 --targetos=android --PLATFORM=x86 gmake + +.PHONY: android-x86 +android-x86: generate $(PROJECTDIR_MINI)/gmake-android-x86/Makefile +ifndef ANDROID_NDK_X86 + $(error ANDROID_NDK_X86 is not set) +endif +ifndef ANDROID_NDK_ROOT + $(error ANDROID_NDK_ROOT is not set) endif $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-x86 config=$(CONFIG) precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-x86 config=$(CONFIG) -.PHONY: asmjs -asmjs: generate +#------------------------------------------------- +# asmjs / Emscripten +#------------------------------------------------- + +$(PROJECTDIR)/gmake-asmjs/Makefile: makefile $(SCRIPTS) $(GENIE) ifndef EMSCRIPTEN $(error EMSCRIPTEN is not set) endif -ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=asmjs --gcc_version=3.7.0 gmake + +.PHONY: asmjs +asmjs: generate $(PROJECTDIR)/gmake-asmjs/Makefile +ifndef EMSCRIPTEN + $(error EMSCRIPTEN is not set) endif $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-asmjs config=$(CONFIG) precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-asmjs config=$(CONFIG) -.PHONY: pnacl -pnacl: generate +#------------------------------------------------- +# PNaCl +#------------------------------------------------- + +$(PROJECTDIR_MINI)/gmake-pnacl/Makefile: makefile $(SCRIPTS) $(GENIE) ifndef NACL_SDK_ROOT $(error NACL_SDK_ROOT is not set) endif -ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=pnacl --gcc_version=3.7.0 --osd=osdmini --targetos=pnacl --NOASM=1 gmake + +.PHONY: pnacl +pnacl: generate $(PROJECTDIR_MINI)/gmake-pnacl/Makefile +ifndef NACL_SDK_ROOT + $(error NACL_SDK_ROOT is not set) endif $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-pnacl config=$(CONFIG) precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-pnacl config=$(CONFIG) @@ -1092,7 +1144,6 @@ solaris_x86: generate $(PROJECTDIR)/gmake-solaris/Makefile # gmake-freebsd #------------------------------------------------- - $(PROJECTDIR)/gmake-freebsd/Makefile: makefile $(SCRIPTS) $(GENIE) $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=freebsd --gcc_version=$(GCC_VERSION) gmake @@ -1109,12 +1160,10 @@ freebsd_x86: generate $(PROJECTDIR)/gmake-freebsd/Makefile $(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-freebsd config=$(CONFIG)32 precompile $(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-freebsd config=$(CONFIG)32 - #------------------------------------------------- # gmake-netbsd #------------------------------------------------- - $(PROJECTDIR)/gmake-netbsd/Makefile: makefile $(SCRIPTS) $(GENIE) $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=netbsd --gcc_version=$(GCC_VERSION) gmake @@ -1131,7 +1180,6 @@ netbsd_x86: generate $(PROJECTDIR)/gmake-netbsd/Makefile $(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-netbsd config=$(CONFIG)32 precompile $(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-netbsd config=$(CONFIG)32 - #------------------------------------------------- # gmake-steamlink #------------------------------------------------- @@ -1156,8 +1204,6 @@ steamlink: generate $(PROJECTDIR)/gmake-steamlink/Makefile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-steamlink config=$(CONFIG) precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-steamlink config=$(CONFIG) - - #------------------------------------------------- # cmake #------------------------------------------------- @@ -1172,7 +1218,6 @@ else $(SILENT)echo "add_subdirectory($(PROJECTDIR)/cmake)" >> CMakeLists.txt endif - #------------------------------------------------- # Clean/bootstrap #------------------------------------------------- @@ -1327,11 +1372,19 @@ cppcheck: @echo Generate CppCheck analysis report cppcheck --enable=all src/ $(CPPCHECK_PARAMS) -j9 +#------------------------------------------------- +# BGFX shaders +#------------------------------------------------- + .PHONY: shaders shaders: $(SILENT) $(MAKE) -C $(SRC)/osd/modules/render/bgfx rebuild +#------------------------------------------------- +# Translation +#------------------------------------------------- + .PHONY: translation translation: diff --git a/scripts/genie.lua b/scripts/genie.lua index 0854523185e..2cf8916713f 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -943,7 +943,7 @@ end local version = str_to_version(_OPTIONS["gcc_version"]) - if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") then + if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then if (version < 30400) then print("Clang version 3.4 or later needed") os.exit(-1)