summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Patrick Mackinlay <pmackinlay@hotmail.com>2024-11-27 00:39:05 +0700
committer GitHub <noreply@github.com>2024-11-27 04:39:05 +1100
commitdc8ba812c1099cb34f419bce0c7cc5eaf5aa3dc0 (patch)
tree1fcb248af8c820c9831fa461ae7148d413a6f9d7 /makefile
parent5b1adf3db9362e205f4b242afd0f42a461a72e22 (diff)
Updated GENie and changed Visual Studio target to Visual Studio 2022. (#13000)
* Updated to GENie 1181. * Applied local fix for GENie resource include directory bug, sent upstream as bkaradzic/GENie#572. * Set MSVC flags to use conformant preprocessor, standards conformance mode, and assume UTF-8 encoding.
Diffstat (limited to 'makefile')
-rw-r--r--makefile26
1 files changed, 13 insertions, 13 deletions
diff --git a/makefile b/makefile
index 6039e9e7e9d..e2e260010d6 100644
--- a/makefile
+++ b/makefile
@@ -1165,28 +1165,28 @@ windows_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-mingw-clang/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES)
#-------------------------------------------------
-# Visual Studio 2019
+# Visual Studio 2022
#-------------------------------------------------
-.PHONY: vs2019
-vs2019: generate
- $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2019
+.PHONY: vs2022
+vs2022: generate
+ $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2022
ifdef MSBUILD
- $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
+ $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2022/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
-.PHONY: vs2019_clang
-vs2019_clang: generate
- $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=clangcl vs2019
+.PHONY: vs2022_clang
+vs2022_clang: generate
+ $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=clangcl vs2022
ifdef MSBUILD
- $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019-clang/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
+ $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2022-clang/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
-.PHONY: vs2019_intel
-vs2019_intel: generate
- $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2019
+.PHONY: vs2022_intel
+vs2022_intel: generate
+ $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2022
ifdef MSBUILD
- $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2019-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
+ $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2022-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
#-------------------------------------------------