Menu
▾
▴
[OMPT-svn-commit] OpenMPT r24448 - in trunk/OpenMPT/build: . premake
|
From: <sv...@op...> - 2025-11-13 14:40:31
|
Author: manx Date: Thu Nov 13 15:40:24 2025 New Revision: 24448 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=24448 Log: [New] build: Premake: Add VS2026 support. Modified: trunk/OpenMPT/build/premake/premake-defaults.lua trunk/OpenMPT/build/premake/premake.lua trunk/OpenMPT/build/regenerate_vs_projects.cmd trunk/OpenMPT/build/regenerate_vs_projects.sh Modified: trunk/OpenMPT/build/premake/premake-defaults.lua ============================================================================== --- trunk/OpenMPT/build/premake/premake-defaults.lua Thu Nov 13 15:11:49 2025 (r24447) +++ trunk/OpenMPT/build/premake/premake-defaults.lua Thu Nov 13 15:40:24 2025 (r24448) @@ -225,14 +225,19 @@ filter { "configurations:Debug" } defines { "DEBUG" } defines { "MPT_BUILD_DEBUG" } - filter { "configurations:Debug", "architecture:ARM" } - symbols "On" - filter { "configurations:Debug", "architecture:ARM64" } - symbols "On" - filter { "configurations:Debug", "architecture:ARM64EC" } - symbols "On" - filter { "configurations:Debug", "architecture:not ARM", "architecture:not ARM64", "architecture:not ARM64EC" } - symbols "FastLink" + if MPT_MSVC_AT_LEAST(2017) and MPT_MSVC_BEFORE(2026) then + filter { "configurations:Debug", "architecture:ARM" } + symbols "On" + filter { "configurations:Debug", "architecture:ARM64" } + symbols "On" + filter { "configurations:Debug", "architecture:ARM64EC" } + symbols "On" + filter { "configurations:Debug", "architecture:not ARM", "architecture:not ARM64", "architecture:not ARM64EC" } + symbols "FastLink" + else + filter { "configurations:Debug" } + symbols "On" + end filter { "configurations:Debug" } if not MPT_OS_WINDOWS_WINRT then staticruntime "On" @@ -376,6 +381,14 @@ if MPT_WIN_BEFORE(MPT_WIN["10"]) then systemversion "10.0.22621.0" elseif MPT_WIN_BEFORE(MPT_WIN["11"]) then + systemversion "10.0.22621.0" + else + systemversion "10.0.26100.0" + end + filter { "action:vs2026" } + if MPT_WIN_BEFORE(MPT_WIN["10"]) then + systemversion "10.0.22621.0" + elseif MPT_WIN_BEFORE(MPT_WIN["11"]) then systemversion "10.0.22621.0" else systemversion "10.0.26100.0" Modified: trunk/OpenMPT/build/premake/premake.lua ============================================================================== --- trunk/OpenMPT/build/premake/premake.lua Thu Nov 13 15:11:49 2025 (r24447) +++ trunk/OpenMPT/build/premake/premake.lua Thu Nov 13 15:40:24 2025 (r24448) @@ -636,7 +636,20 @@ require('vstudio') local function mptGlobalsUWP(prj) - if _ACTION == 'vs2022' then + if _ACTION == 'vs2026' then + premake.w('<DefaultLanguage>en-US</DefaultLanguage>') + premake.w('<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>') + premake.w('<AppContainerApplication>true</AppContainerApplication>') + premake.w('<ApplicationType>Windows Store</ApplicationType>') + premake.w('<ApplicationTypeRevision>10.0</ApplicationTypeRevision>') + if MPT_WIN_AT_LEAST(MPT_WIN["11"]) then + premake.w('<WindowsTargetPlatformVersion Condition=" \'$(WindowsTargetPlatformVersion)\' == \'\' ">10.0.26100.0</WindowsTargetPlatformVersion>') + premake.w('<WindowsTargetPlatformMinVersion>10.0.22631.0</WindowsTargetPlatformMinVersion>') + elseif MPT_WIN_AT_LEAST(MPT_WIN["10"]) then + premake.w('<WindowsTargetPlatformVersion Condition=" \'$(WindowsTargetPlatformVersion)\' == \'\' ">10.0.22621.0</WindowsTargetPlatformVersion>') + premake.w('<WindowsTargetPlatformMinVersion>10.0.19045.0</WindowsTargetPlatformMinVersion>') + end + elseif _ACTION == 'vs2022' then premake.w('<DefaultLanguage>en-US</DefaultLanguage>') premake.w('<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>') premake.w('<AppContainerApplication>true</AppContainerApplication>') Modified: trunk/OpenMPT/build/regenerate_vs_projects.cmd ============================================================================== --- trunk/OpenMPT/build/regenerate_vs_projects.cmd Thu Nov 13 15:11:49 2025 (r24447) +++ trunk/OpenMPT/build/regenerate_vs_projects.cmd Thu Nov 13 15:40:24 2025 (r24448) @@ -52,14 +52,26 @@ echo Done ^) ^|^| pause start cmd /c ^( ^ +%PREMAKE% --file=build/premake/premake.lua --os=windows vs2026 --windows-version=win10 --windows-family=desktop --windows-charset=Unicode ^&^& ^ +echo Done ^) ^|^| pause + +start cmd /c ^( ^ %PREMAKE% --file=build/premake/premake.lua --os=windows vs2022 --windows-version=win11 --windows-family=desktop --windows-charset=Unicode ^&^& ^ echo Done ^) ^|^| pause start cmd /c ^( ^ +%PREMAKE% --file=build/premake/premake.lua --os=windows vs2026 --windows-version=win11 --windows-family=desktop --windows-charset=Unicode ^&^& ^ +echo Done ^) ^|^| pause + +start cmd /c ^( ^ %PREMAKE% --file=build/premake/premake.lua --os=windows vs2022 --clang --windows-version=win11 --windows-family=desktop --windows-charset=Unicode ^&^& ^ echo Done ^) ^|^| pause start cmd /c ^( ^ +%PREMAKE% --file=build/premake/premake.lua --os=windows vs2026 --clang --windows-version=win11 --windows-family=desktop --windows-charset=Unicode ^&^& ^ +echo Done ^) ^|^| pause + +start cmd /c ^( ^ %PREMAKE% --file=build/premake/premake.lua --os=windows vs2022 --windows-version=win10 --windows-family=uwp --windows-charset=Unicode ^&^& ^ echo Done ^) ^|^| pause @@ -68,6 +80,14 @@ echo Done ^) ^|^| pause start cmd /c ^( ^ +%PREMAKE% --file=build/premake/premake.lua --os=windows vs2026 --windows-version=win10 --windows-family=uwp --windows-charset=Unicode ^&^& ^ +echo Done ^) ^|^| pause + +start cmd /c ^( ^ +%PREMAKE% --file=build/premake/premake.lua --os=windows vs2026 --windows-version=win11 --windows-family=uwp --windows-charset=Unicode ^&^& ^ +echo Done ^) ^|^| pause + +start cmd /c ^( ^ %PREMAKE% --file=build/premake-xcode/premake.lua --target=macosx xcode4 ^&^& ^ %PREMAKE% --file=build/premake-xcode/premake.lua --target=ios xcode4 ^&^& ^ echo Done ^) ^|^| pause Modified: trunk/OpenMPT/build/regenerate_vs_projects.sh ============================================================================== --- trunk/OpenMPT/build/regenerate_vs_projects.sh Thu Nov 13 15:11:49 2025 (r24447) +++ trunk/OpenMPT/build/regenerate_vs_projects.sh Thu Nov 13 15:40:24 2025 (r24448) @@ -46,18 +46,33 @@ ${PREMAKE} --file=build/premake/premake.lua --os=windows vs2022 --windows-version=win10 --windows-family=desktop --windows-charset=Unicode && \ echo ok & +${PREMAKE} --file=build/premake/premake.lua --os=windows vs2026 --windows-version=win10 --windows-family=desktop --windows-charset=Unicode && \ +echo ok & + ${PREMAKE} --file=build/premake/premake.lua --os=windows vs2022 --windows-version=win11 --windows-family=desktop --windows-charset=Unicode && \ echo ok & +${PREMAKE} --file=build/premake/premake.lua --os=windows vs2026 --windows-version=win11 --windows-family=desktop --windows-charset=Unicode && \ +echo ok & + ${PREMAKE} --file=build/premake/premake.lua --os=windows vs2022 --clang --windows-version=win11 --windows-family=desktop --windows-charset=Unicode && \ echo ok & +${PREMAKE} --file=build/premake/premake.lua --os=windows vs2026 --clang --windows-version=win11 --windows-family=desktop --windows-charset=Unicode && \ +echo ok & + ${PREMAKE} --file=build/premake/premake.lua --os=windows vs2022 --windows-version=win10 --windows-family=uwp --windows-charset=Unicode && \ echo ok & ${PREMAKE} --file=build/premake/premake.lua --os=windows vs2022 --windows-version=win11 --windows-family=uwp --windows-charset=Unicode && \ echo ok & +${PREMAKE} --file=build/premake/premake.lua --os=windows vs2026 --windows-version=win10 --windows-family=uwp --windows-charset=Unicode && \ +echo ok & + +${PREMAKE} --file=build/premake/premake.lua --os=windows vs2026 --windows-version=win11 --windows-family=uwp --windows-charset=Unicode && \ +echo ok & + ${PREMAKE} --file=build/premake-xcode/premake.lua --target=macosx xcode4 && \ ${PREMAKE} --file=build/premake-xcode/premake.lua --target=ios xcode4 && \ echo ok & |
