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

Merge pull request #836 from heinrich5991/pr_ddnet_unify_icons

Browse source 
Unify icons for gcc and MSVC, fix server icon
This commit is contained in:
Dennis Felsing 2017-09-16 11:18:40 +02:00 committed by GitHub
parent 455bcdd160 05f136fdfb
commit f60eb5658f
8 changed files with 5 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -679,11 +679,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()
@ -786,11 +782,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()

9
bam.lua
View file

@ -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)

0
other/icons/DDNet-Server_gcc.rc → other/icons/DDNet-Server.rc
View file

1
other/icons/DDNet-Server_cl.rc
View file

@ -1 +0,0 @@
50h ICON "DDNet-Server.ico"

7
other/icons/DDNet.exe.manifest
View file

@ -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>

1
other/icons/DDNet.rc Normal file
View file

@ -0,0 +1 @@
ID ICON "DDNet.ico"

1
other/icons/DDNet_cl.rc
View file

@ -1 +0,0 @@
50h ICON "DDNet.ico"

2
other/icons/DDNet_gcc.rc
View file

@ -1,2 +0,0 @@
ID ICON "DDNet.ico"
1 24 "DDNet.exe.manifest"