edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed missing teeworlds icon for gcc

Browse source
This commit is contained in:
Sworddragon 2010-11-14 12:50:23 +01:00 committed by oy
parent 0cfcb1c0c2
commit 96a1b130fa
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bam.lua
View file

@ -55,8 +55,13 @@ DuplicateDirectoryStructure("src", "src", "objs")
function ResCompile(scriptfile)
scriptfile = Path(scriptfile)
output = PathBase(scriptfile) .. ".res"
AddJob(output, "rc " .. scriptfile, "rc /fo " .. output .. " " .. scriptfile)
if config.compiler.driver == "cl" then
output = PathBase(scriptfile) .. ".res"
AddJob(output, "rc " .. scriptfile, "rc /fo " .. output .. " " .. scriptfile)
elseif config.compiler.driver == "gcc" then
output = PathBase(scriptfile) .. ".coff"
AddJob(output, "windres " .. scriptfile, "windres -i " .. scriptfile .. " -o " .. output)
end
AddDependency(output, scriptfile)
return output
end
@ -108,11 +113,12 @@ client_depends = {}
if family == "windows" then
table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\vc2005libs\\SDL.dll"))
end
if config.compiler.driver == "cl" then
client_link_other = {ResCompile("other/icons/teeworlds.rc")}
if config.compiler.driver == "cl" then
client_link_other = {ResCompile("other/icons/teeworlds_cl.rc")}
elseif config.compiler.driver == "gcc" then
client_link_other = {ResCompile("other/icons/teeworlds_gcc.rc")}
end
end
function Intermediate_Output(settings, input)

0
other/icons/teeworlds.rc → other/icons/teeworlds_cl.rc
View file

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

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