summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2016-07-18 00:24:21 +0200
committerRémi Verschelde <rverschelde@gmail.com>2016-07-18 00:24:21 +0200
commit523e46ad0a915364de92d209ae59be14fbb3a7a4 (patch)
tree7888332ce0e765033fc1bc8d65cae3dcb7b4b279
parente6cf0d444b37522ab1e637dd173e8c7199bf36d7 (diff)
Revert "Make editor compatible with Windows high contrast themes"
This reverts commit 85a5290ee8a4c95be19f086181379330baf0deed. The patch itself is good and it could maybe be readded in the future, but right now Microsoft forced its Windows 10 "update" on people with older Intel HD Graphics 3000 IGP without ensuring that they can ship proper drivers, and such users seem to get Godot crashing due to this patch. Sorry :( Closes #5452.
-rw-r--r--platform/windows/godot.manifest24
-rw-r--r--platform/windows/godot_res.rc3
2 files changed, 0 insertions, 27 deletions
diff --git a/platform/windows/godot.manifest b/platform/windows/godot.manifest
deleted file mode 100644
index c095f007b0..0000000000
--- a/platform/windows/godot.manifest
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
- </requestedPrivileges>
- </security>
- </trustInfo>
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <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>
diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc
index d069ecdc79..5f1e951e0f 100644
--- a/platform/windows/godot_res.rc
+++ b/platform/windows/godot_res.rc
@@ -1,4 +1,3 @@
-#include <winuser.h>
#include "core/version.h"
#ifndef _STR
#define _STR(m_x) #m_x
@@ -7,8 +6,6 @@
GODOT_ICON ICON platform/windows/godot.ico
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST platform/windows/godot.manifest
-
1 VERSIONINFO
FILEVERSION VERSION_MAJOR,VERSION_MINOR,0,0
PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,0,0