Added Windows 7/8 compatibility section to manifest

http://msdn.microsoft.com/en-us/library/windows/desktop/hh848036.aspx
This commit is contained in:
Birunthan Mohanathas 2012-09-18 22:37:35 +03:00
parent 9cc3e897b9
commit 678ac501ad
5 changed files with 37 additions and 16 deletions

View File

@ -23,16 +23,6 @@
#include <ShellAPI.h> #include <ShellAPI.h>
#include "../Library/Rainmeter.h" #include "../Library/Rainmeter.h"
#if defined _M_IX86
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
#elif defined _M_IA64
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"")
#elif defined _M_X64
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
#else
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
#endif
/* /*
** Entry point. ** Entry point.
** **

View File

@ -0,0 +1,13 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
</dependentAssembly>
</dependency>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
</application>
</compatibility>
</assembly>

View File

@ -109,6 +109,9 @@ xcopy /Q /S /Y ..\Build\Skins ..\testbench\x32\debug\skins
xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\debug\themes xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\debug\themes
:skip</Command> :skip</Command>
</PostBuildEvent> </PostBuildEvent>
<Manifest>
<AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
@ -144,6 +147,9 @@ xcopy /Q /S /Y ..\Build\Skins ..\testbench\x64\debug\skins
xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\debug\themes xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\debug\themes
:skip</Command> :skip</Command>
</PostBuildEvent> </PostBuildEvent>
<Manifest>
<AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
@ -183,6 +189,9 @@ xcopy /Q /S /Y ..\Build\Skins ..\testbench\x32\release\skins
xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\release\themes xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\release\themes
:skip</Command> :skip</Command>
</PostBuildEvent> </PostBuildEvent>
<Manifest>
<AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
@ -220,6 +229,9 @@ xcopy /Q /S /Y ..\Build\Skins ..\testbench\x64\release\skins
xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\release\themes xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\release\themes
:skip</Command> :skip</Command>
</PostBuildEvent> </PostBuildEvent>
<Manifest>
<AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Application.cpp" /> <ClCompile Include="Application.cpp" />

View File

@ -23,12 +23,6 @@
#include "zip.h" #include "zip.h"
#include "unzip.h" #include "unzip.h"
#if defined _M_IX86
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
#elif defined _M_X64
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
#endif
#define MAX_LINE_LENGTH 4096 #define MAX_LINE_LENGTH 4096
#define MB_ERROR MB_OK | MB_TOPMOST | MB_ICONERROR #define MB_ERROR MB_OK | MB_TOPMOST | MB_ICONERROR

View File

@ -105,6 +105,9 @@
<BuildLog> <BuildLog>
<Path>$(IntDir)\$(MSBuildProjectName).log</Path> <Path>$(IntDir)\$(MSBuildProjectName).log</Path>
</BuildLog> </BuildLog>
<Manifest>
<AdditionalManifestFiles>..\Application\Application.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<MASM> <MASM>
@ -140,6 +143,9 @@
<BuildLog> <BuildLog>
<Path>$(IntDir)\$(MSBuildProjectName).log</Path> <Path>$(IntDir)\$(MSBuildProjectName).log</Path>
</BuildLog> </BuildLog>
<Manifest>
<AdditionalManifestFiles>..\Application\Application.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<MASM> <MASM>
@ -174,6 +180,9 @@
<Bscmake> <Bscmake>
<OutputFile>$(IntDir)SkinInstaller.bsc</OutputFile> <OutputFile>$(IntDir)SkinInstaller.bsc</OutputFile>
</Bscmake> </Bscmake>
<Manifest>
<AdditionalManifestFiles>..\Application\Application.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<MASM> <MASM>
@ -206,6 +215,9 @@
<Bscmake> <Bscmake>
<OutputFile>$(IntDir)SkinInstaller.bsc</OutputFile> <OutputFile>$(IntDir)SkinInstaller.bsc</OutputFile>
</Bscmake> </Bscmake>
<Manifest>
<AdditionalManifestFiles>..\Application\Application.manifest</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\Library\Dialog.cpp" /> <ClCompile Include="..\Library\Dialog.cpp" />