diff options
| author | Mat M <mathew1800@gmail.com> | 2017-02-12 08:44:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-12 08:44:38 -0500 |
| commit | da5683cf275c51ece30454f262ff523f59a3b9ef (patch) | |
| tree | beed43b60b06129a0374e21cb8b9bb4419f2d9e0 /Source/Core | |
| parent | 5e799fd469fca6b59af35c142660f19629585e6c (diff) | |
| parent | 715170759c277944d39c28769b05a3bc5f5974ea (diff) | |
Merge pull request #4880 from ligfx/windowsmanifest
Use .manifest file for apps on Windows
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt2/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinQt2/DolphinQt2.manifest | 8 | ||||
| -rw-r--r-- | Source/Core/DolphinQt2/DolphinQt2.vcxproj | 5 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/DolphinWX.manifest | 8 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/DolphinWX.vcxproj | 2 |
6 files changed, 29 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt2/CMakeLists.txt b/Source/Core/DolphinQt2/CMakeLists.txt index a3ec2d13a9..ce59f8b243 100644 --- a/Source/Core/DolphinQt2/CMakeLists.txt +++ b/Source/Core/DolphinQt2/CMakeLists.txt @@ -32,6 +32,10 @@ set(SRCS list(APPEND LIBS core uicommon) +if(WIN32) + list(APPEND SRCS DolphinQt2.manifest) +endif() + set(DOLPHINQT2_BINARY dolphin-emu-qt2) add_executable(${DOLPHINQT2_BINARY} ${SRCS} ${UI_HEADERS}) diff --git a/Source/Core/DolphinQt2/DolphinQt2.manifest b/Source/Core/DolphinQt2/DolphinQt2.manifest new file mode 100644 index 0000000000..aad83c561a --- /dev/null +++ b/Source/Core/DolphinQt2/DolphinQt2.manifest @@ -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> diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index 722b678537..90773ae69f 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -65,6 +65,9 @@ <ResourceCompile> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ExternalsDir)/gettext</AdditionalIncludeDirectories> </ResourceCompile> + <Manifest> + <AdditionalManifestFiles>DolphinQt2.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles> + </Manifest> </ItemDefinitionGroup> <!--QRC and UI files are handled automatically--> <ItemGroup> @@ -236,4 +239,4 @@ <Message Text="Copy: @(BinaryFiles) -> $(BinaryOutputDir)" Importance="High" /> <Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" /> </Target> -</Project>
\ No newline at end of file +</Project> diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index 7f4c258867..8c104a877c 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -108,7 +108,10 @@ if(APPLE) endif() if(WIN32) - list(APPEND SRCS DolphinWX.rc) + list(APPEND SRCS + DolphinWX.manifest + DolphinWX.rc + ) endif() if(APPLE) diff --git a/Source/Core/DolphinWX/DolphinWX.manifest b/Source/Core/DolphinWX/DolphinWX.manifest new file mode 100644 index 0000000000..aad83c561a --- /dev/null +++ b/Source/Core/DolphinWX/DolphinWX.manifest @@ -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> diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj index bae3476422..da2dba0fea 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj @@ -51,7 +51,7 @@ <ClCompile /> <ClCompile /> <Manifest> - <EnableDpiAwareness>true</EnableDpiAwareness> + <AdditionalManifestFiles>DolphinWX.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles> </Manifest> </ItemDefinitionGroup> <ItemGroup> |