ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4880 from ligfx/windowsmanifest 

Use .manifest file for apps on Windows
This commit is contained in:
Mat M 2017-02-12 08:44:38 -05:00 committed by GitHub
parent 5e799fd469 715170759c
commit da5683cf27
6 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt2/CMakeLists.txt
View File

@ -32,6 +32,10 @@ set(SRCS
list(APPEND LIBS core uicommon) list(APPEND LIBS core uicommon)
if(WIN32)
list(APPEND SRCS DolphinQt2.manifest)
endif()
set(DOLPHINQT2_BINARY dolphin-emu-qt2) set(DOLPHINQT2_BINARY dolphin-emu-qt2)
add_executable(${DOLPHINQT2_BINARY} ${SRCS} ${UI_HEADERS}) add_executable(${DOLPHINQT2_BINARY} ${SRCS} ${UI_HEADERS})

8
Source/Core/DolphinQt2/DolphinQt2.manifest Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
</windowsSettings>
</application>
</assembly>

5
Source/Core/DolphinQt2/DolphinQt2.vcxproj
View File

@ -65,6 +65,9 @@
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ExternalsDir)/gettext</AdditionalIncludeDirectories> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ExternalsDir)/gettext</AdditionalIncludeDirectories>
</ResourceCompile> </ResourceCompile>
<Manifest>
<AdditionalManifestFiles>DolphinQt2.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!--QRC and UI files are handled automatically--> <!--QRC and UI files are handled automatically-->
<ItemGroup> <ItemGroup>
@ -236,4 +239,4 @@
<Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" /> <Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
<Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" /> <Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
</Target> </Target>
</Project> </Project>

5
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -108,7 +108,10 @@ if(APPLE)
endif() endif()
if(WIN32) if(WIN32)
list(APPEND SRCS DolphinWX.rc) list(APPEND SRCS
DolphinWX.manifest
DolphinWX.rc
)
endif() endif()
if(APPLE) if(APPLE)

8
Source/Core/DolphinWX/DolphinWX.manifest Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
</windowsSettings>
</application>
</assembly>

2
Source/Core/DolphinWX/DolphinWX.vcxproj
View File

@ -51,7 +51,7 @@
<ClCompile /> <ClCompile />
<ClCompile /> <ClCompile />
<Manifest> <Manifest>
<EnableDpiAwareness>true</EnableDpiAwareness> <AdditionalManifestFiles>DolphinWX.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest> </Manifest>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>