Skip to content

Commit e2a6738

Browse files
manxoristmanxorist
committed
[Imp] build: premake: MSVC: Set Windows subsystem version to minimum supported OS version.
git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@24804 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent f508cb7 commit e2a6738

File tree

176 files changed

+2783
-852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+2783
-852
lines changed

‎build/premake/premake-defaults.lua‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,17 @@
7979
-- nothing
8080
end
8181
end
82+
filter {}
83+
filter { "kind:ConsoleApp" }
84+
if MPT_BUILD_MSBUILD then
85+
linkoptions { "/SUBSYSTEM:CONSOLE," .. string.format("%d", (MPT_WIN_VERSION >> 24) & 0xff) .. "." .. string.format("%d", (MPT_WIN_VERSION >> 16) & 0xff) }
86+
end
87+
filter {}
88+
filter { "kind:WindowedApp" }
89+
if MPT_BUILD_MSBUILD then
90+
linkoptions { "/SUBSYSTEM:WINDOWS," .. string.format("%d", (MPT_WIN_VERSION >> 24) & 0xff) .. "." .. string.format("%d", (MPT_WIN_VERSION >> 16) & 0xff) }
91+
end
92+
filter {}
8293
end
8394

8495
function mpt_locale(locale)

‎build/vs2017win7/OpenMPT-ANSI.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
310310
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
311311
<LargeAddressAware>true</LargeAddressAware>
312-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
312+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
313313
</Link>
314314
<Manifest>
315315
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -343,7 +343,7 @@
343343
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
344344
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
345345
<LargeAddressAware>true</LargeAddressAware>
346-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
346+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
347347
</Link>
348348
<Manifest>
349349
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -383,7 +383,7 @@
383383
<OptimizeReferences>true</OptimizeReferences>
384384
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
385385
<LargeAddressAware>true</LargeAddressAware>
386-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
386+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
387387
</Link>
388388
<Manifest>
389389
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -422,7 +422,7 @@
422422
<OptimizeReferences>true</OptimizeReferences>
423423
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
424424
<LargeAddressAware>true</LargeAddressAware>
425-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
425+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
426426
</Link>
427427
<Manifest>
428428
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -462,7 +462,7 @@
462462
<EnableCOMDATFolding>true</EnableCOMDATFolding>
463463
<OptimizeReferences>true</OptimizeReferences>
464464
<LargeAddressAware>true</LargeAddressAware>
465-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
465+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
466466
</Link>
467467
<Manifest>
468468
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -501,7 +501,7 @@
501501
<EnableCOMDATFolding>true</EnableCOMDATFolding>
502502
<OptimizeReferences>true</OptimizeReferences>
503503
<LargeAddressAware>true</LargeAddressAware>
504-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
504+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
505505
</Link>
506506
<Manifest>
507507
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -535,7 +535,7 @@
535535
<SubSystem>Windows</SubSystem>
536536
<GenerateDebugInformation>true</GenerateDebugInformation>
537537
<LargeAddressAware>true</LargeAddressAware>
538-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
538+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
539539
</Link>
540540
<Manifest>
541541
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -568,7 +568,7 @@
568568
<SubSystem>Windows</SubSystem>
569569
<GenerateDebugInformation>true</GenerateDebugInformation>
570570
<LargeAddressAware>true</LargeAddressAware>
571-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
571+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
572572
</Link>
573573
<Manifest>
574574
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -608,7 +608,7 @@
608608
<OptimizeReferences>true</OptimizeReferences>
609609
<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
610610
<LargeAddressAware>true</LargeAddressAware>
611-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
611+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
612612
</Link>
613613
<Manifest>
614614
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -647,7 +647,7 @@
647647
<OptimizeReferences>true</OptimizeReferences>
648648
<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
649649
<LargeAddressAware>true</LargeAddressAware>
650-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
650+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
651651
</Link>
652652
<Manifest>
653653
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -687,7 +687,7 @@
687687
<EnableCOMDATFolding>true</EnableCOMDATFolding>
688688
<OptimizeReferences>true</OptimizeReferences>
689689
<LargeAddressAware>true</LargeAddressAware>
690-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
690+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
691691
</Link>
692692
<Manifest>
693693
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -726,7 +726,7 @@
726726
<EnableCOMDATFolding>true</EnableCOMDATFolding>
727727
<OptimizeReferences>true</OptimizeReferences>
728728
<LargeAddressAware>true</LargeAddressAware>
729-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
729+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
730730
</Link>
731731
<Manifest>
732732
<EnableDpiAwareness>false</EnableDpiAwareness>

‎build/vs2017win7/OpenMPT-UTF8.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
310310
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
311311
<LargeAddressAware>true</LargeAddressAware>
312-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
312+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
313313
</Link>
314314
<Manifest>
315315
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -343,7 +343,7 @@
343343
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>
344344
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
345345
<LargeAddressAware>true</LargeAddressAware>
346-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
346+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
347347
</Link>
348348
<Manifest>
349349
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -383,7 +383,7 @@
383383
<OptimizeReferences>true</OptimizeReferences>
384384
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
385385
<LargeAddressAware>true</LargeAddressAware>
386-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
386+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
387387
</Link>
388388
<Manifest>
389389
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -422,7 +422,7 @@
422422
<OptimizeReferences>true</OptimizeReferences>
423423
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
424424
<LargeAddressAware>true</LargeAddressAware>
425-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
425+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
426426
</Link>
427427
<Manifest>
428428
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -462,7 +462,7 @@
462462
<EnableCOMDATFolding>true</EnableCOMDATFolding>
463463
<OptimizeReferences>true</OptimizeReferences>
464464
<LargeAddressAware>true</LargeAddressAware>
465-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
465+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
466466
</Link>
467467
<Manifest>
468468
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -501,7 +501,7 @@
501501
<EnableCOMDATFolding>true</EnableCOMDATFolding>
502502
<OptimizeReferences>true</OptimizeReferences>
503503
<LargeAddressAware>true</LargeAddressAware>
504-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
504+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
505505
</Link>
506506
<Manifest>
507507
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -535,7 +535,7 @@
535535
<SubSystem>Windows</SubSystem>
536536
<GenerateDebugInformation>true</GenerateDebugInformation>
537537
<LargeAddressAware>true</LargeAddressAware>
538-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
538+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
539539
</Link>
540540
<Manifest>
541541
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -568,7 +568,7 @@
568568
<SubSystem>Windows</SubSystem>
569569
<GenerateDebugInformation>true</GenerateDebugInformation>
570570
<LargeAddressAware>true</LargeAddressAware>
571-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
571+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
572572
</Link>
573573
<Manifest>
574574
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -608,7 +608,7 @@
608608
<OptimizeReferences>true</OptimizeReferences>
609609
<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
610610
<LargeAddressAware>true</LargeAddressAware>
611-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
611+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
612612
</Link>
613613
<Manifest>
614614
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -647,7 +647,7 @@
647647
<OptimizeReferences>true</OptimizeReferences>
648648
<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
649649
<LargeAddressAware>true</LargeAddressAware>
650-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
650+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
651651
</Link>
652652
<Manifest>
653653
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -687,7 +687,7 @@
687687
<EnableCOMDATFolding>true</EnableCOMDATFolding>
688688
<OptimizeReferences>true</OptimizeReferences>
689689
<LargeAddressAware>true</LargeAddressAware>
690-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
690+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
691691
</Link>
692692
<Manifest>
693693
<EnableDpiAwareness>false</EnableDpiAwareness>
@@ -726,7 +726,7 @@
726726
<EnableCOMDATFolding>true</EnableCOMDATFolding>
727727
<OptimizeReferences>true</OptimizeReferences>
728728
<LargeAddressAware>true</LargeAddressAware>
729-
<AdditionalOptions>/DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
729+
<AdditionalOptions>/SUBSYSTEM:WINDOWS,6.1 /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions)</AdditionalOptions>
730730
</Link>
731731
<Manifest>
732732
<EnableDpiAwareness>false</EnableDpiAwareness>

0 commit comments

Comments
 (0)