mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-19 17:14:18 +00:00
Fix icons
This commit is contained in:
parent
7d26c1fa38
commit
0db98b218b
|
@ -295,7 +295,11 @@ if(CLIENT)
|
|||
)
|
||||
|
||||
if(TARGET_OS STREQUAL "windows")
|
||||
set(CLIENT_ICON "other/icons/DDNet.rc")
|
||||
if(MSVC)
|
||||
set(CLIENT_ICON "other/icons/DDNet_cl.rc")
|
||||
else()
|
||||
set(CLIENT_ICON "other/icons/DDNet_gcc.rc")
|
||||
endif()
|
||||
else()
|
||||
set(CLIENT_ICON)
|
||||
endif()
|
||||
|
@ -333,7 +337,11 @@ file(GLOB_RECURSE GAME_SERVER "src/game/server/*.cpp" "src/game/server/*.h")
|
|||
set(GAME_GENERATED_SERVER "src/game/generated/server_data.cpp" "src/game/generated/server_data.h")
|
||||
set(SERVER_SRC ${ENGINE_SERVER} ${GAME_SERVER} ${GAME_GENERATED_SERVER})
|
||||
if(TARGET_OS STREQUAL "windows")
|
||||
set(SERVER_ICON "other/icons/DDNet-Server.rc")
|
||||
if(MSVC)
|
||||
set(CLIENT_ICON "other/icons/DDNet-Server_cl.rc")
|
||||
else()
|
||||
set(CLIENT_ICON "other/icons/DDNet-Server_gcc.rc")
|
||||
endif()
|
||||
else()
|
||||
set(SERVER_ICON)
|
||||
endif()
|
||||
|
|
4
bam.lua
4
bam.lua
|
@ -164,10 +164,10 @@ if family == "windows" then
|
|||
|
||||
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")}
|
||||
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_srv_gcc.rc")}
|
||||
server_link_other = {ResCompile("other/icons/DDNet-Server_gcc.rc")}
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue