edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try removing manifest

Browse source 
Causes bug with Intel driver using OpenGL2:
https://stackoverflow.com/questions/34676697/embedding-manifest-into-the-application-binary-breaks-opengl-2
This commit is contained in:
def 2018-05-07 20:57:06 +02:00
parent 05c41efcea
commit 6df2ad55ed
3 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -857,14 +857,8 @@ if(CLIENT)
if(TARGET_OS STREQUAL "windows") if(TARGET_OS STREQUAL "windows")
set(CLIENT_ICON "other/icons/DDNet.rc") set(CLIENT_ICON "other/icons/DDNet.rc")
if(NOT MINGW)
set(CLIENT_MANIFEST "other/manifest/DDNet.manifest")
else()
set(CLIENT_MANIFEST "other/manifest/DDNet.rc")
endif()
else() else()
set(CLIENT_ICON) set(CLIENT_ICON)
set(CLIENT_MANIFEST)
endif() endif()
# Target # Target
@ -872,7 +866,6 @@ if(CLIENT)
add_executable(${TARGET_CLIENT} add_executable(${TARGET_CLIENT}
${CLIENT_SRC} ${CLIENT_SRC}
${CLIENT_ICON} ${CLIENT_ICON}
${CLIENT_MANIFEST}
${DEPS_CLIENT} ${DEPS_CLIENT}
$<TARGET_OBJECTS:engine-shared> $<TARGET_OBJECTS:engine-shared>
$<TARGET_OBJECTS:game-shared> $<TARGET_OBJECTS:game-shared>

28
other/manifest/DDNet.manifest
View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<assemblyIdentity version="1.0.0.0" name="DDNet.exe"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<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}"/>
</application>
</compatibility>
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<asmv3:windowsSettings
xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>True/PM</dpiAware>
</asmv3:windowsSettings>
</asmv3:application>
</asmv1:assembly>

2
other/manifest/DDNet.rc
View file

@ -1,2 +0,0 @@
#include "winuser.h"
1 RT_MANIFEST DDNet.manifest