Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[5340] trunk/OpenMPT
|
From: <man...@us...> - 2015-06-19 17:19:41
|
Revision: 5340
http://sourceforge.net/p/modplug/code/5340
Author: manxorist
Date: 2015-06-19 17:19:34 +0000 (Fri, 19 Jun 2015)
Log Message:
-----------
[Mod] Add applicatiopn manifest compatibility section to both OpenMPT and PluginBridge. Since Windows 7, programs without this section will only get a Windows Vista compatiblity environment. OpenMPT does not want to stay behind and works just fine with modern behaviour (the differences as documented do not seem to apply to OpenMPT anyway). Since Windows 8.1, this also affects version information via GetVersionEx (which returns Win8 on Win8.1 and Win10 without a compatibility manifest). Windows versions before Windows 7 do ignore this setting. As this change might, in some remote theoretical case, affect plugin compatibility, bump the OpenMPT version. Note: mt.exe from both VS2008 and VS2010 does not know about the compatiblity manifest element and issues a warning. The manifest gets properly added to the .exe nevertheless. Unfortunately, there is nothing we can do about the warning.
[Mod] OpenMPT: Version is now 1.25.00.15
Modified Paths:
--------------
trunk/OpenMPT/build/premake/mpt-PluginBridge.lua
trunk/OpenMPT/build/vs2008/PluginBridge.vcproj
trunk/OpenMPT/build/vs2010/PluginBridge.vcxproj
trunk/OpenMPT/build/vs2012/PluginBridge.vcxproj
trunk/OpenMPT/build/vs2013/PluginBridge.vcxproj
trunk/OpenMPT/build/vs2015/PluginBridge.vcxproj
trunk/OpenMPT/common/versionNumber.h
trunk/OpenMPT/mptrack/res/OpenMPT.manifest
trunk/OpenMPT/mptrack/res/rt_manif.bin
trunk/OpenMPT/pluginBridge/PluginBridge.vcxproj
Added Paths:
-----------
trunk/OpenMPT/pluginBridge/PluginBridge.manifest
Modified: trunk/OpenMPT/build/premake/mpt-PluginBridge.lua
===================================================================
--- trunk/OpenMPT/build/premake/mpt-PluginBridge.lua 2015-06-19 17:13:30 UTC (rev 5339)
+++ trunk/OpenMPT/build/premake/mpt-PluginBridge.lua 2015-06-19 17:19:34 UTC (rev 5340)
@@ -16,8 +16,13 @@
"../../pluginBridge/Bridge.h",
"../../pluginBridge/BridgeCommon.h",
"../../pluginBridge/BridgeOpCodes.h",
+ }
+ files {
"../../pluginBridge/PluginBridge.rc",
}
+ files {
+ "../../pluginBridge/PluginBridge.manifest",
+ }
defines { "MODPLUG_TRACKER" }
flags { "SEH", "Unicode", "WinMain", "ExtraWarnings" }
prebuildcommands { "..\\..\\build\\svn_version\\update_svn_version_vs_premake.cmd $(IntDir)" }
Modified: trunk/OpenMPT/build/vs2008/PluginBridge.vcproj
===================================================================
--- trunk/OpenMPT/build/vs2008/PluginBridge.vcproj 2015-06-19 17:13:30 UTC (rev 5339)
+++ trunk/OpenMPT/build/vs2008/PluginBridge.vcproj 2015-06-19 17:19:34 UTC (rev 5340)
@@ -82,6 +82,7 @@
/>
<Tool
Name="VCManifestTool"
+ AdditionalManifestFiles="../../pluginBridge/PluginBridge.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -164,6 +165,7 @@
/>
<Tool
Name="VCManifestTool"
+ AdditionalManifestFiles="../../pluginBridge/PluginBridge.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -248,6 +250,7 @@
/>
<Tool
Name="VCManifestTool"
+ AdditionalManifestFiles="../../pluginBridge/PluginBridge.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -333,6 +336,7 @@
/>
<Tool
Name="VCManifestTool"
+ AdditionalManifestFiles="../../pluginBridge/PluginBridge.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -414,6 +418,7 @@
/>
<Tool
Name="VCManifestTool"
+ AdditionalManifestFiles="../../pluginBridge/PluginBridge.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -496,6 +501,7 @@
/>
<Tool
Name="VCManifestTool"
+ AdditionalManifestFiles="../../pluginBridge/PluginBridge.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -581,6 +587,7 @@
/>
<Tool
Name="VCManifestTool"
+ AdditionalManifestFiles="../../pluginBridge/PluginBridge.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -667,6 +674,7 @@
/>
<Tool
Name="VCManifestTool"
+ AdditionalManifestFiles="../../pluginBridge/PluginBridge.manifest"
/>
<Tool
Name="VCXDCMakeTool"
@@ -710,6 +718,10 @@
>
</File>
<File
+ RelativePath="..\..\pluginBridge\PluginBridge.manifest"
+ >
+ </File>
+ <File
RelativePath="..\..\pluginBridge\PluginBridge.rc"
>
</File>
Modified: trunk/OpenMPT/build/vs2010/PluginBridge.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2010/PluginBridge.vcxproj 2015-06-19 17:13:30 UTC (rev 5339)
+++ trunk/OpenMPT/build/vs2010/PluginBridge.vcxproj 2015-06-19 17:19:34 UTC (rev 5340)
@@ -187,6 +187,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -216,6 +219,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -253,6 +259,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -290,6 +299,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -318,6 +330,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -346,6 +361,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -383,6 +401,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -420,6 +441,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -438,6 +462,9 @@
<ClCompile Include="..\..\pluginBridge\Bridge.cpp" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\pluginBridge\PluginBridge.manifest" />
+ </ItemGroup>
+ <ItemGroup>
<ResourceCompile Include="..\..\pluginBridge\PluginBridge.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: trunk/OpenMPT/build/vs2012/PluginBridge.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2012/PluginBridge.vcxproj 2015-06-19 17:13:30 UTC (rev 5339)
+++ trunk/OpenMPT/build/vs2012/PluginBridge.vcxproj 2015-06-19 17:19:34 UTC (rev 5340)
@@ -195,6 +195,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -224,6 +227,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -261,6 +267,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -298,6 +307,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -326,6 +338,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -354,6 +369,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -391,6 +409,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -428,6 +449,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -446,6 +470,9 @@
<ClCompile Include="..\..\pluginBridge\Bridge.cpp" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\pluginBridge\PluginBridge.manifest" />
+ </ItemGroup>
+ <ItemGroup>
<ResourceCompile Include="..\..\pluginBridge\PluginBridge.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: trunk/OpenMPT/build/vs2013/PluginBridge.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2013/PluginBridge.vcxproj 2015-06-19 17:13:30 UTC (rev 5339)
+++ trunk/OpenMPT/build/vs2013/PluginBridge.vcxproj 2015-06-19 17:19:34 UTC (rev 5340)
@@ -196,6 +196,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -225,6 +228,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -262,6 +268,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -299,6 +308,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -327,6 +339,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -355,6 +370,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -392,6 +410,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -429,6 +450,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -447,6 +471,9 @@
<ClCompile Include="..\..\pluginBridge\Bridge.cpp" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\pluginBridge\PluginBridge.manifest" />
+ </ItemGroup>
+ <ItemGroup>
<ResourceCompile Include="..\..\pluginBridge\PluginBridge.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: trunk/OpenMPT/build/vs2015/PluginBridge.vcxproj
===================================================================
--- trunk/OpenMPT/build/vs2015/PluginBridge.vcxproj 2015-06-19 17:13:30 UTC (rev 5339)
+++ trunk/OpenMPT/build/vs2015/PluginBridge.vcxproj 2015-06-19 17:19:34 UTC (rev 5340)
@@ -196,6 +196,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -225,6 +228,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -262,6 +268,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -299,6 +308,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -327,6 +339,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -355,6 +370,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -392,6 +410,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -429,6 +450,9 @@
<DataExecutionPrevention>false</DataExecutionPrevention>
<LargeAddressAware>true</LargeAddressAware>
</Link>
+ <Manifest>
+ <AdditionalManifestFiles>../../pluginBridge/PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
<PreBuildEvent>
<Command>..\..\build\svn_version\update_svn_version_vs_premake.cmd $(IntDir)</Command>
</PreBuildEvent>
@@ -447,6 +471,9 @@
<ClCompile Include="..\..\pluginBridge\Bridge.cpp" />
</ItemGroup>
<ItemGroup>
+ <None Include="..\..\pluginBridge\PluginBridge.manifest" />
+ </ItemGroup>
+ <ItemGroup>
<ResourceCompile Include="..\..\pluginBridge\PluginBridge.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h 2015-06-19 17:13:30 UTC (rev 5339)
+++ trunk/OpenMPT/common/versionNumber.h 2015-06-19 17:19:34 UTC (rev 5340)
@@ -19,7 +19,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 25
#define VER_MINOR 00
-#define VER_MINORMINOR 14
+#define VER_MINORMINOR 15
//Version string. For example "1.17.02.28"
#define MPT_VERSION_STR VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)
Modified: trunk/OpenMPT/mptrack/res/OpenMPT.manifest
===================================================================
--- trunk/OpenMPT/mptrack/res/OpenMPT.manifest 2015-06-19 17:13:30 UTC (rev 5339)
+++ trunk/OpenMPT/mptrack/res/OpenMPT.manifest 2015-06-19 17:19:34 UTC (rev 5340)
@@ -6,4 +6,21 @@
version="1.0.0.0"
/>
<description>OpenMPT / ModPlug Tracker</description>
-</assembly>
\ No newline at end of file
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <!-- VS2008 and VS2010 mt.exe will warn with a -->
+ <!-- 'manifest authoring warning 81010002: Unrecognized Element' -->
+ <!-- here. There is nothing we can do about that. -->
+ <application>
+ <!-- Windows 10 -->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ <!-- Windows 8.1 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!-- Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <!-- Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!-- Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ </application>
+ </compatibility>
+</assembly>
Modified: trunk/OpenMPT/mptrack/res/rt_manif.bin
===================================================================
--- trunk/OpenMPT/mptrack/res/rt_manif.bin 2015-06-19 17:13:30 UTC (rev 5339)
+++ trunk/OpenMPT/mptrack/res/rt_manif.bin 2015-06-19 17:19:34 UTC (rev 5340)
@@ -8,4 +8,21 @@
type="win32"
name="mptrack.exe"/>
<description>OpenMPT</description>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <!-- VS2008 and VS2010 mt.exe will warn with a -->
+ <!-- 'manifest authoring warning 81010002: Unrecognized Element' -->
+ <!-- here. There is nothing we can do about that. -->
+ <application>
+ <!-- Windows 10 -->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ <!-- Windows 8.1 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!-- Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <!-- Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!-- Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ </application>
+ </compatibility>
</assembly>
\ No newline at end of file
Added: trunk/OpenMPT/pluginBridge/PluginBridge.manifest
===================================================================
--- trunk/OpenMPT/pluginBridge/PluginBridge.manifest (rev 0)
+++ trunk/OpenMPT/pluginBridge/PluginBridge.manifest 2015-06-19 17:19:34 UTC (rev 5340)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity
+ type="win32"
+ name="OpenMPT.PluginBridge"
+ version="1.0.0.0"
+ />
+ <description>OpenMPT PluginBridge</description>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <!-- VS2008 and VS2010 mt.exe will warn with a -->
+ <!-- 'manifest authoring warning 81010002: Unrecognized Element' -->
+ <!-- here. There is nothing we can do about that. -->
+ <application>
+ <!-- Windows 10 -->
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ <!-- Windows 8.1 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!-- Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <!-- Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!-- Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ </application>
+ </compatibility>
+</assembly>
Modified: trunk/OpenMPT/pluginBridge/PluginBridge.vcxproj
===================================================================
--- trunk/OpenMPT/pluginBridge/PluginBridge.vcxproj 2015-06-19 17:13:30 UTC (rev 5339)
+++ trunk/OpenMPT/pluginBridge/PluginBridge.vcxproj 2015-06-19 17:19:34 UTC (rev 5340)
@@ -112,6 +112,9 @@
<Command>if not exist "$(TargetDir)..\x64-Debug" mkdir "$(TargetDir)..\x64-Debug"
copy /y "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\x64-Debug\$(TargetFileName)"</Command>
</PostBuildEvent>
+ <Manifest>
+ <AdditionalManifestFiles>PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -138,6 +141,9 @@
<Command>if not exist "$(TargetDir)..\Win32-Debug" mkdir "$(TargetDir)..\Win32-Debug"
copy /y "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\Win32-Debug\$(TargetFileName)"</Command>
</PostBuildEvent>
+ <Manifest>
+ <AdditionalManifestFiles>PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -168,6 +174,10 @@
<Command>if not exist "$(TargetDir)..\x64" mkdir "$(TargetDir)..\x64"
copy /y "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\x64\$(TargetFileName)"</Command>
</PostBuildEvent>
+ <Manifest />
+ <Manifest>
+ <AdditionalManifestFiles>PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@@ -198,6 +208,9 @@
<Command>if not exist "$(TargetDir)..\Win32" mkdir "$(TargetDir)..\Win32"
copy /y "$(TargetDir)$(TargetFileName)" "$(TargetDir)..\Win32\$(TargetFileName)"</Command>
</PostBuildEvent>
+ <Manifest>
+ <AdditionalManifestFiles>PluginBridge.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
+ </Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Bridge.cpp" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
