Author: jscinoz-guest
Date: 2008-04-18 07:37:46 +0000 (Fri, 18 Apr 2008)
New Revision: 6634
Modified:
packages/trunk/teeworlds/debian/patches/system-libs.patch
Log:
Patches updated for system libs looks all good now
Modified: packages/trunk/teeworlds/debian/patches/system-libs.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/system-libs.patch 2008-04-18
07:15:54 UTC (rev 6633)
+++ packages/trunk/teeworlds/debian/patches/system-libs.patch 2008-04-18
07:37:46 UTC (rev 6634)
@@ -1,7 +1,7 @@
Index: teeworlds-0.4.2/default.bam
===================================================================
--- teeworlds-0.4.2.orig/default.bam 2008-04-18 09:16:00.000000000 +1000
-+++ teeworlds-0.4.2/default.bam 2008-04-18 11:03:57.000000000 +1000
++++ teeworlds-0.4.2/default.bam 2008-04-18 17:35:40.000000000 +1000
@@ -214,7 +214,6 @@
-- set some platform specific settings
@@ -10,15 +10,16 @@
if family == "unix" then
if platform == "macosx" then
-@@ -232,6 +231,7 @@
+@@ -232,6 +231,8 @@
end
settings.linker.libs:add("pthread")
+ settings.linker.libs:add("z")
++ settings.linker.libs:add("pnglite")
end
elseif family == "windows" then
glfw_platform = "win32"
-@@ -244,30 +244,6 @@
+@@ -244,30 +245,6 @@
settings.linker.libs:add("shell32.lib")
end
@@ -49,7 +50,7 @@
-- build game components
engine_settings = settings:copy()
-@@ -287,7 +263,7 @@
+@@ -287,7 +264,7 @@
-- client
client_settings = engine_settings:copy()
@@ -58,19 +59,21 @@
if family == "unix" then
if platform == "macosx" then
-@@ -303,6 +279,11 @@
+@@ -301,8 +278,13 @@
+ else
+ client_settings.linker.libs:add("asound")
client_settings.linker.libs:add("X11")
++ client_settings.linker.libs:add("Xrandr")
client_settings.linker.libs:add("GL")
client_settings.linker.libs:add("GLU")
+ client_settings.linker.libs:add("z")
+ client_settings.linker.libs:add("wavpack")
+ client_settings.linker.libs:add("portaudio")
+ client_settings.linker.libs:add("glfw")
-+ client_settings.linker.libs:add("pnglite")
end
elseif family == "windows" then
client_settings.linker.libs:add("opengl32.lib")
-@@ -311,9 +292,6 @@
+@@ -311,9 +293,6 @@
end
external_settings = settings:copy()
@@ -80,7 +83,7 @@
engine = Compile(engine_settings, Collect("src/engine/*.c"))
client = Compile(client_settings, Collect("src/engine/client/*.c"))
-@@ -332,19 +310,19 @@
+@@ -332,19 +311,19 @@
tools = {}
for i,v in objs do
toolname = PathFilename(PathBase(v))
@@ -91,7 +94,7 @@
-- build client, server and master server
client_exe = Link(client_settings, "teeworlds", game_shared,
game_client,
- engine, client, game_editor, glfw, portaudio, zlib, pnglite,
wavpack,
-+ engine, client, game_editor,
++ engine, client, game_editor, pnglite,
client_link_other)
server_exe = Link(server_settings, "teeworlds_srv", engine, server,
@@ -120,7 +123,7 @@
Index: teeworlds-0.4.2/src/engine/client/ec_gfx.c
===================================================================
--- teeworlds-0.4.2.orig/src/engine/client/ec_gfx.c 2008-04-18
09:21:39.000000000 +1000
-+++ teeworlds-0.4.2/src/engine/client/ec_gfx.c 2008-04-18 11:06:26.000000000
+1000
++++ teeworlds-0.4.2/src/engine/client/ec_gfx.c 2008-04-18 15:16:05.000000000
+1000
@@ -1,6 +1,6 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/external/glfw/include/GL/glfw.h>
@@ -198,7 +201,7 @@
Index: teeworlds-0.4.2/src/tools/tileset_borderfix.c
===================================================================
--- teeworlds-0.4.2.orig/src/tools/tileset_borderfix.c 2008-04-18
11:06:00.000000000 +1000
-+++ teeworlds-0.4.2/src/tools/tileset_borderfix.c 2008-04-18
11:06:07.000000000 +1000
++++ teeworlds-0.4.2/src/tools/tileset_borderfix.c 2008-04-18
15:16:08.000000000 +1000
@@ -1,6 +1,6 @@
/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
