summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
Diffstat (limited to 'makefile')
-rw-r--r--makefile86
1 files changed, 27 insertions, 59 deletions
diff --git a/makefile b/makefile
index b55f0aab91c..3da69b80f64 100644
--- a/makefile
+++ b/makefile
@@ -27,7 +27,6 @@
# NO_OPENGL = 0
# USE_DISPATCH_GL = 0
-# MODERN_WIN_API = 0
# USE_SDL = 1
# SDL_INI_PATH = .;$HOME/.mame/;ini;
# SDL2_MULTIAPI = 1
@@ -149,6 +148,10 @@ ifeq ($(MSYSTEM),MINGW32)
PLATFORM := x86
else ifeq ($(MSYSTEM),MINGW64)
PLATFORM := x86
+else ifeq ($(MSYSTEM),UCRT64)
+PLATFORM := x86
+else ifeq ($(MSYSTEM),CLANG64)
+PLATFORM := x86
else ifeq ($(MSYSTEM),CLANGARM64)
PLATFORM := arm64
else # MSYSTEM
@@ -209,12 +212,6 @@ endif
ifeq ($(firstword $(filter Linux,$(UNAME))),Linux)
OS := linux
-else ifeq ($(firstword $(filter Solaris,$(UNAME))),Solaris)
-OS := solaris
-GENIEOS := solaris
-else ifeq ($(firstword $(filter SunOS,$(UNAME))),SunOS)
-OS := solaris
-GENIEOS := solaris
else ifeq ($(firstword $(filter FreeBSD,$(UNAME))),FreeBSD)
OS := freebsd
GENIEOS := bsd
@@ -246,6 +243,10 @@ ifeq ($(MSYSTEM),MINGW32)
MINGW32 := $(MINGW_PREFIX)
else ifeq ($(MSYSTEM),MINGW64)
MINGW64 := $(MINGW_PREFIX)
+else ifeq ($(MSYSTEM),UCRT64)
+ MINGW64 := $(MINGW_PREFIX)
+else ifeq ($(MSYSTEM),CLANG64)
+ MINGW64 := $(MINGW_PREFIX)
else ifeq ($(MSYSTEM),CLANGARM64)
MINGW64 := $(MINGW_PREFIX)
endif # MSYSTEM
@@ -317,6 +318,10 @@ ifeq ($(MSYSTEM),MINGW32)
ARCHITECTURE = _x86
else ifeq ($(MSYSTEM),MINGW64)
ARCHITECTURE := _x64
+else ifeq ($(MSYSTEM),UCRT64)
+ARCHITECTURE := _x64
+else ifeq ($(MSYSTEM),CLANG64)
+ARCHITECTURE := _x64
else ifeq ($(MSYSTEM),CLANGARM64)
ARCHITECTURE := _x64
else ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
@@ -460,8 +465,6 @@ else ifeq ($(TARGETOS),netbsd)
OSD := sdl
else ifeq ($(TARGETOS),openbsd)
OSD := sdl
-else ifeq ($(TARGETOS),solaris)
-OSD := sdl
else ifeq ($(TARGETOS),macosx)
OSD := sdl3
else ifeq ($(TARGETOS),asmjs)
@@ -743,10 +746,6 @@ ifdef USE_QTDEBUG
PARAMS += --USE_QTDEBUG='$(USE_QTDEBUG)'
endif
-ifdef MODERN_WIN_API
-PARAMS += --MODERN_WIN_API='$(MODERN_WIN_API)'
-endif
-
ifdef USE_SDL
PARAMS += --USE_SDL='$(USE_SDL)'
endif
@@ -1136,11 +1135,22 @@ ifdef MSBUILD
$(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2022-clang/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
-.PHONY: vs2022_intel
-vs2022_intel: generate
- $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=intel-15 vs2022
+#-------------------------------------------------
+# Visual Studio 2026
+#-------------------------------------------------
+
+.PHONY: vs2026
+vs2026: generate
+ $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) vs2026
+ifdef MSBUILD
+ $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2026/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
+endif
+
+.PHONY: vs2026_clang
+vs2026_clang: generate
+ $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --vs=clangcl vs2026
ifdef MSBUILD
- $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2022-intel/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
+ $(SILENT) msbuild.exe $(PROJECTDIR_WIN)/vs2026-clang/$(PROJECT_NAME).sln $(MSBUILD_PARAMS)
endif
#-------------------------------------------------
@@ -1318,48 +1328,6 @@ macosx_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)32
#-------------------------------------------------
-# gmake-solaris
-#-------------------------------------------------
-
-ifndef CLANG_VERSION
-$(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile: makefile $(SCRIPTS) $(GENIE)
- $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=solaris --gcc_version=$(GCC_VERSION) $(MAKETYPE)
-endif
-.PHONY: solaris_x64
-solaris_x64: generate $(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile
- $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)64 precompile
- $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)64
-
-.PHONY: solaris
-solaris: solaris_x86
-
-.PHONY: solaris_x86
-solaris_x86: generate $(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile
- $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)32 precompile
- $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)32
-
-#-------------------------------------------------
-# gmake-solaris-clang
-#-------------------------------------------------
-
-ifdef CLANG_VERSION
-$(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile: makefile $(SCRIPTS) $(GENIE)
- $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=solaris --gcc_version=$(CLANG_VERSION) $(MAKETYPE)
-endif
-.PHONY: solaris_x64_clang
-solaris_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile
- $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)64 precompile
- $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)64
-
-.PHONY: solaris_clang
-solaris_clang: solaris_x86_clang
-
-.PHONY: solaris_x86_clang
-solaris_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile
- $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)32 precompile
- $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)32
-
-#-------------------------------------------------
# gmake-freebsd
#-------------------------------------------------