From f76f0cce2bf6d49ce98776726134c9f06be11a5a Mon Sep 17 00:00:00 2001
From: def <dennis@felsin9.de>
Date: Sat, 15 Jul 2017 19:18:29 +0200
Subject: [PATCH] Actually use Windows manifest

---
 bam.lua                                      | 1 -
 other/{manifest => icons}/DDNet.exe.manifest | 0
 other/icons/DDNet_cl.rc                      | 1 +
 other/icons/DDNet_gcc.rc                     | 1 +
 4 files changed, 2 insertions(+), 1 deletion(-)
 rename other/{manifest => icons}/DDNet.exe.manifest (100%)

diff --git a/bam.lua b/bam.lua
index bb3ae5b59..975e8925d 100644
--- a/bam.lua
+++ b/bam.lua
@@ -174,7 +174,6 @@ if family == "windows" then
 	table.insert(server_sql_depends, CopyToDirectory(".", "other/mysql/vc2005libs/mysqlcppconn.dll"))
 	table.insert(server_sql_depends, CopyToDirectory(".", "other/mysql/vc2005libs/libmysql.dll"))
 
-	client_link_other = {ResCompile("other/manifest/DDNet.rc")}
 	if config.compiler.driver == "cl" then
 		client_link_other = {ResCompile("other/icons/DDNet_cl.rc")}
 		server_link_other = {ResCompile("other/icons/DDNet_srv_cl.rc")}
diff --git a/other/manifest/DDNet.exe.manifest b/other/icons/DDNet.exe.manifest
similarity index 100%
rename from other/manifest/DDNet.exe.manifest
rename to other/icons/DDNet.exe.manifest
diff --git a/other/icons/DDNet_cl.rc b/other/icons/DDNet_cl.rc
index 178cb62fd..a99eeaf2a 100644
--- a/other/icons/DDNet_cl.rc
+++ b/other/icons/DDNet_cl.rc
@@ -1 +1,2 @@
 50h ICON "DDNet.ico"
+1 24 "DDNet.exe.manifest"
diff --git a/other/icons/DDNet_gcc.rc b/other/icons/DDNet_gcc.rc
index 072c60a69..176d2693e 100644
--- a/other/icons/DDNet_gcc.rc
+++ b/other/icons/DDNet_gcc.rc
@@ -1 +1,2 @@
 ID ICON "DDNet.ico"
+1 24 "DDNet.exe.manifest"