From 05f136fdfb31ad0c9e395f9aa25f7e821fa57a4f Mon Sep 17 00:00:00 2001
From: heinrich5991 <heinrich5991@gmail.com>
Date: Tue, 1 Aug 2017 21:43:56 +0200
Subject: [PATCH] Unify icons for gcc and MSVC, fix server icon

---
 CMakeLists.txt                                       | 12 ++----------
 bam.lua                                              |  9 ++-------
 other/icons/{DDNet-Server_gcc.rc => DDNet-Server.rc} |  0
 other/icons/DDNet-Server_cl.rc                       |  1 -
 other/icons/DDNet.exe.manifest                       |  7 -------
 other/icons/DDNet.rc                                 |  1 +
 other/icons/DDNet_cl.rc                              |  1 -
 other/icons/DDNet_gcc.rc                             |  2 --
 8 files changed, 5 insertions(+), 28 deletions(-)
 rename other/icons/{DDNet-Server_gcc.rc => DDNet-Server.rc} (100%)
 delete mode 100644 other/icons/DDNet-Server_cl.rc
 delete mode 100644 other/icons/DDNet.exe.manifest
 create mode 100644 other/icons/DDNet.rc
 delete mode 100644 other/icons/DDNet_cl.rc
 delete mode 100644 other/icons/DDNet_gcc.rc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4ff10337..26d265aa9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -645,11 +645,7 @@ if(CLIENT)
   )
 
   if(TARGET_OS STREQUAL "windows")
-    if(MSVC)
-      set(CLIENT_ICON "other/icons/DDNet_cl.rc")
-    else()
-      set(CLIENT_ICON "other/icons/DDNet_gcc.rc")
-    endif()
+    set(CLIENT_ICON "other/icons/DDNet.rc")
   else()
     set(CLIENT_ICON)
   endif()
@@ -752,11 +748,7 @@ set(GAME_GENERATED_SERVER
 )
 set(SERVER_SRC ${ENGINE_SERVER} ${GAME_SERVER} ${GAME_GENERATED_SERVER})
 if(TARGET_OS STREQUAL "windows")
-  if(MSVC)
-    set(CLIENT_ICON "other/icons/DDNet-Server_cl.rc")
-  else()
-    set(CLIENT_ICON "other/icons/DDNet-Server_gcc.rc")
-  endif()
+  set(SERVER_ICON "other/icons/DDNet-Server.rc")
 else()
   set(SERVER_ICON)
 endif()
diff --git a/bam.lua b/bam.lua
index d9e272ffd..6352dd8ef 100644
--- a/bam.lua
+++ b/bam.lua
@@ -162,13 +162,8 @@ if family == "windows" then
 	table.insert(server_sql_depends, CopyToDirectory(".", "ddnet-libs/mysql/windows/mysqlcppconn.dll"))
 	table.insert(server_sql_depends, CopyToDirectory(".", "ddnet-libs/mysql/windows/libmysql.dll"))
 
-	if config.compiler.driver == "cl" then
-		client_link_other = {ResCompile("other/icons/DDNet_cl.rc")}
-		server_link_other = {ResCompile("other/icons/DDNet-Server_cl.rc")}
-	elseif config.compiler.driver == "gcc" then
-		client_link_other = {ResCompile("other/icons/DDNet_gcc.rc")}
-		server_link_other = {ResCompile("other/icons/DDNet-Server_gcc.rc")}
-	end
+	client_link_other = {ResCompile("other/icons/DDNet.rc")}
+	server_link_other = {ResCompile("other/icons/DDNet-Server.rc")}
 end
 
 function Intermediate_Output(settings, input)
diff --git a/other/icons/DDNet-Server_gcc.rc b/other/icons/DDNet-Server.rc
similarity index 100%
rename from other/icons/DDNet-Server_gcc.rc
rename to other/icons/DDNet-Server.rc
diff --git a/other/icons/DDNet-Server_cl.rc b/other/icons/DDNet-Server_cl.rc
deleted file mode 100644
index 5be9af55b..000000000
--- a/other/icons/DDNet-Server_cl.rc
+++ /dev/null
@@ -1 +0,0 @@
-50h ICON "DDNet-Server.ico"
diff --git a/other/icons/DDNet.exe.manifest b/other/icons/DDNet.exe.manifest
deleted file mode 100644
index 846f0ee8d..000000000
--- a/other/icons/DDNet.exe.manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
-  <asmv3:application>
-    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
-      <dpiAware>true/PM</dpiAware>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-</assembly>
diff --git a/other/icons/DDNet.rc b/other/icons/DDNet.rc
new file mode 100644
index 000000000..072c60a69
--- /dev/null
+++ b/other/icons/DDNet.rc
@@ -0,0 +1 @@
+ID ICON "DDNet.ico"
diff --git a/other/icons/DDNet_cl.rc b/other/icons/DDNet_cl.rc
deleted file mode 100644
index 178cb62fd..000000000
--- a/other/icons/DDNet_cl.rc
+++ /dev/null
@@ -1 +0,0 @@
-50h ICON "DDNet.ico"
diff --git a/other/icons/DDNet_gcc.rc b/other/icons/DDNet_gcc.rc
deleted file mode 100644
index 176d2693e..000000000
--- a/other/icons/DDNet_gcc.rc
+++ /dev/null
@@ -1,2 +0,0 @@
-ID ICON "DDNet.ico"
-1 24 "DDNet.exe.manifest"