From ed2b7e5ef1626c0d6318b6ea71897efbb4356277 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sun, 29 Sep 2019 15:30:18 +0200 Subject: Synced with GENie upstream revision e78d6c1 (#5631) * Synced with GENie upstream revision e78d6c1 * Add Visual Studio 2019 support * Fix hardcoded -m64 * Switch appveyor to Visual Studio 2019 * Fix genie being built as 32-bit * MSVC build is known to be broken currently. Let it fail until all the known issues are fixed. * Update the packages before building * Build with 3 threads Appveyor VMs have only 2 cores and 8 GB RAM. * Enable caching of pacman cache --- makefile | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index d090057225f..e6fc30b13a8 100644 --- a/makefile +++ b/makefile @@ -404,6 +404,21 @@ CC := $(SILENT)gcc LD := $(SILENT)g++ CXX:= $(SILENT)g++ +#------------------------------------------------- +# determine the whether -m32, -m64 or nothing +# should be passed to gcc when building genie +#------------------------------------------------- + +ifeq ($(ARCHITECTURE),_x86) +MPARAM := -m32 +else +ifeq ($(ARCHITECTURE),_x64) +MPARAM := -m64 +else +MPARAM := +endif +endif + #------------------------------------------------- # specify OSD layer: windows, sdl, etc. # build scripts will be run from @@ -1176,6 +1191,38 @@ ifdef FASTBUILD $(SILENT) fbuild.exe -config $(PROJECTDIR_WIN)/vs2017-fastbuild/ftbuild.bff $(FASTBUILD_PARAMS) endif +#------------------------------------------------- +# Visual Studio 2019 +#------------------------------------------------- + +.PHONY: vs2019 +vs2019: generate + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2019 +ifdef MSBUILD + $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) +endif + +.PHONY: vs2019_intel +vs2019_intel: generate + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2019 +ifdef MSBUILD + $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) +endif + +.PHONY: vs2019_uwp +vs2019_uwp: generate + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=winstore82 --osd=uwp --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_USE_PORTAUDIO=1 --MODERN_WIN_API=1 vs2015 +ifdef MSBUILD + $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019-winstore82/$(PROJECT_NAME).sln $(MSBUILD_PARAMS) +endif + +.PHONY: vs2019_fastbuild +vs2019_fastbuild: generate + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2019-fastbuild +ifdef FASTBUILD + $(SILENT) fbuild.exe -config $(PROJECTDIR_WIN)/vs2019-fastbuild/ftbuild.bff $(FASTBUILD_PARAMS) +endif + #------------------------------------------------- # Visual Studio LLVM #------------------------------------------------- @@ -1590,13 +1637,13 @@ endif GENIE_SRC=$(wildcard 3rdparty/genie/src/host/*.c) $(GENIE): $(GENIE_SRC) - $(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/genie/build/gmake.$(GENIEOS) -f genie.make + $(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/genie/build/gmake.$(GENIEOS) -f genie.make MPARAM=$(MPARAM) 3rdparty/genie/src/hosts/%.c: .PHONY: genieclean genieclean: - $(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/genie/build/gmake.$(GENIEOS) -f genie.make clean + $(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/genie/build/gmake.$(GENIEOS) -f genie.make MPARAM=$(MPARAM) clean clean: genieclean @echo Cleaning... -- cgit v1.2.3-70-g09d2