From: ankry <ankry@pld-linux.org>
Date: Sat, 25 Sep 2004 08:58:11 +0000 (+0000)
Subject: fixed build
X-Git-Tag: AC-STABLE
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fclanbomber.git;a=commitdiff_plain;h=refs%2Fheads%2FAC-branch

fixed build

Changed files:
    clanbomber-assert.patch -> 1.1
    clanbomber-gcc33.patch -> 1.1
---

diff --git a/clanbomber-assert.patch b/clanbomber-assert.patch
new file mode 100644
index 0000000..72cc356
--- /dev/null
+++ b/clanbomber-assert.patch
@@ -0,0 +1,19 @@
+--- clanbomber-1.02a/clanbomber/Controller_AI.cpp.orig	2004-09-25 10:01:35.000000000 +0200
++++ clanbomber-1.02a/clanbomber/Controller_AI.cpp	2004-09-25 10:14:14.000000000 +0200
+@@ -19,6 +19,7 @@
+ 
+ //#define WITH_DEBUG
+ 
++#include <ClanLib/Core/System/cl_assert.h>
+ #include "ClanBomber.h"
+ #include "Controller_AI.h"
+ 
+@@ -312,7 +313,7 @@
+ 
+ void Controller_AI::do_job()
+ {
+-	assert(jobs.get_num_items() > 0);
++	cl_assert(jobs.get_num_items() > 0);
+ 	jobs[0]->execute();
+ }
+ 
diff --git a/clanbomber-gcc33.patch b/clanbomber-gcc33.patch
new file mode 100644
index 0000000..554f7ff
--- /dev/null
+++ b/clanbomber-gcc33.patch
@@ -0,0 +1,64 @@
+--- clanbomber-1.02a/clanbomber/ClanBomber.h~	2004-09-25 09:30:27.000000000 +0200
++++ clanbomber-1.02a/clanbomber/ClanBomber.h	2004-09-25 09:30:27.000000000 +0200
+@@ -102,7 +102,7 @@
+ 
+ class ClanBomberApplication : public CL_ClanApplication
+ {
+-friend Debug;
++friend class Debug;
+ protected:
+ 
+ 	void run_intro();
+--- clanbomber-1.02a/clanbomber/Controller_AI.h~	2004-09-25 09:40:27.000000000 +0200
++++ clanbomber-1.02a/clanbomber/Controller_AI.h	2004-09-25 09:40:27.000000000 +0200
+@@ -100,9 +100,9 @@
+ 
+ class Controller_AI : public Controller
+ {
+-friend Job_Go;
+-friend Job_PutBomb;
+-friend Job_Wait;
++friend class Job_Go;
++friend class Job_PutBomb;
++friend class Job_Wait;
+ public:
+ 	Controller_AI ();
+ 	virtual ~Controller_AI () {};
+--- clanbomber-1.02a/clanbomber/Menu.h~	2004-09-25 10:45:59.000000000 +0200
++++ clanbomber-1.02a/clanbomber/Menu.h	2004-09-25 10:45:59.000000000 +0200
+@@ -29,7 +29,7 @@
+ 
+ class MenuItem
+ {
+- friend Menu;
++ friend class Menu;
+  public:
+   MenuItem( const CL_String _text, int _id, int _parent );
+   virtual ~MenuItem() {};
+@@ -60,7 +60,7 @@
+ 
+ class MenuItem_Value : public MenuItem
+ {
+-friend Menu;
++friend class Menu;
+ public:
+ 	MenuItem_Value( const CL_String _text, int _id, int _parent, int _min, int _max, int _value );
+ 	virtual ~MenuItem_Value() {};
+@@ -85,7 +85,7 @@
+ 
+ class MenuItem_String : public MenuItem
+ {
+-friend Menu;
++friend class Menu;
+ public:
+ 	MenuItem_String( const CL_String _text, int _id, int _parent, CL_String _string);
+ 	virtual ~MenuItem_String() {};
+@@ -101,7 +101,7 @@
+ 
+ class MenuItem_StringList : public MenuItem
+ {
+-friend Menu;
++friend class Menu;
+ public:
+ 	MenuItem_StringList( const CL_String _text, int _id, int _parent, CL_Array<CL_String> _string_list, int _value );
+ 	virtual ~MenuItem_StringList() {};