r6629 - packages/trunk/teeworlds/debian/patches

[Jack Coulter]

Author: jscinoz-guest
Date: 2008-04-18 03:39:34 +0000 (Fri, 18 Apr 2008)
New Revision: 6629

Modified:
   packages/trunk/teeworlds/debian/patches/system-libs.patch
Log:
patch to use native pnglite


Modified: packages/trunk/teeworlds/debian/patches/system-libs.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/system-libs.patch	2008-04-18 02:54:40 UTC (rev 6628)
+++ packages/trunk/teeworlds/debian/patches/system-libs.patch	2008-04-18 03:39:34 UTC (rev 6629)
@@ -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 09:32:22.000000000 +1000
++++ teeworlds-0.4.2/default.bam	2008-04-18 11:03:57.000000000 +1000
 @@ -214,7 +214,6 @@
  
  	-- set some platform specific settings
@@ -58,7 +58,7 @@
  
  	if family == "unix" then
     		if platform == "macosx" then
-@@ -303,6 +279,10 @@
+@@ -303,6 +279,11 @@
  			client_settings.linker.libs:add("X11")
  			client_settings.linker.libs:add("GL")
  			client_settings.linker.libs:add("GLU")
@@ -66,18 +66,20 @@
 +			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,8 +291,6 @@
+@@ -311,9 +292,6 @@
  	end
  
  	external_settings = settings:copy()
 -	zlib = Compile(external_settings, Collect("src/engine/external/zlib/*.c"))
 -	wavpack = Compile(external_settings, Collect("src/engine/external/wavpack/*.c"))
- 	pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
+-	pnglite = Compile(external_settings, Collect("src/engine/external/pnglite/*.c"))
  
  	engine = Compile(engine_settings, Collect("src/engine/*.c"))
+ 	client = Compile(client_settings, Collect("src/engine/client/*.c"))
 @@ -332,19 +310,19 @@
  	tools = {}
  	for i,v in objs do
@@ -89,7 +91,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, pnglite,
++		engine, client, game_editor,
  		client_link_other)
  
  	server_exe = Link(server_settings, "teeworlds_srv", engine, server,
@@ -118,14 +120,16 @@
 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 09:21:50.000000000 +1000
-@@ -1,5 +1,5 @@
++++ teeworlds-0.4.2/src/engine/client/ec_gfx.c	2008-04-18 11:06:26.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>
+-#include <engine/external/pnglite/pnglite.h>
 +#include <GL/glfw.h>
- #include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
  
  #include <engine/e_system.h>
+ #include <engine/e_client_interface.h>
 Index: teeworlds-0.4.2/src/engine/client/ec_inp.c
 ===================================================================
 --- teeworlds-0.4.2.orig/src/engine/client/ec_inp.c	2008-04-18 09:22:13.000000000 +1000
@@ -179,3 +183,27 @@
  #else
  #include "zlite.h"
  #endif
+Index: teeworlds-0.4.2/src/tools/dilate.c
+===================================================================
+--- teeworlds-0.4.2.orig/src/tools/dilate.c	2008-04-18 11:05:45.000000000 +1000
++++ teeworlds-0.4.2/src/tools/dilate.c	2008-04-18 11:05:52.000000000 +1000
+@@ -1,6 +1,6 @@
+ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+ 
+-#include "../engine/external/pnglite/pnglite.c"
++#include <pnglite.h>
+ 
+ typedef struct pixel_t
+ {
+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
+@@ -1,6 +1,6 @@
+ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+ 
+-#include "../engine/external/pnglite/pnglite.c"
++#include <pnglite.h>
+ 
+ typedef struct pixel_t
+ {