From 96a1b130fa0aaea68e453c8e17cf8d3cbe097ae3 Mon Sep 17 00:00:00 2001
From: Sworddragon <sworddragon2@aol.com>
Date: Sun, 14 Nov 2010 12:50:23 +0100
Subject: Fixed missing teeworlds icon for gcc

---
 bam.lua                      | 18 ++++++++++++------
 other/icons/teeworlds.rc     |  1 -
 other/icons/teeworlds_cl.rc  |  1 +
 other/icons/teeworlds_gcc.rc |  1 +
 4 files changed, 14 insertions(+), 7 deletions(-)
 delete mode 100644 other/icons/teeworlds.rc
 create mode 100644 other/icons/teeworlds_cl.rc
 create mode 100644 other/icons/teeworlds_gcc.rc

diff --git a/bam.lua b/bam.lua
index 6891894b..79b72944 100644
--- a/bam.lua
+++ b/bam.lua
@@ -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)
diff --git a/other/icons/teeworlds.rc b/other/icons/teeworlds.rc
deleted file mode 100644
index a4eab1f9..00000000
--- a/other/icons/teeworlds.rc
+++ /dev/null
@@ -1 +0,0 @@
-50h ICON "teeworlds.ico"
diff --git a/other/icons/teeworlds_cl.rc b/other/icons/teeworlds_cl.rc
new file mode 100644
index 00000000..a4eab1f9
--- /dev/null
+++ b/other/icons/teeworlds_cl.rc
@@ -0,0 +1 @@
+50h ICON "teeworlds.ico"
diff --git a/other/icons/teeworlds_gcc.rc b/other/icons/teeworlds_gcc.rc
new file mode 100644
index 00000000..aa5dcb44
--- /dev/null
+++ b/other/icons/teeworlds_gcc.rc
@@ -0,0 +1 @@
+ID ICON "teeworlds.ico"
-- 
cgit 1.4.1