|
From: Thomas F. <tfj...@st...> - 2007-06-21 23:48:21
|
Index: include/alleggl.h =================================================================== --- include/alleggl.h (revision 1240) +++ include/alleggl.h (working copy) @@ -68,7 +68,7 @@ #include "allegrogl/gl_ext.h" #ifdef ALLEGRO_WITH_XWINDOWS -#ifndef HAVE_LIBPTHREAD +#ifndef ALLEGRO_HAVE_LIBPTHREAD # error AllegroGL requires Allegro to have pthread support enabled! #endif #include <alleggl_config.h> Yup. AGL source is now broken on allegro svn and any future releases. -- Thomas Fjellstrom tfj...@st... |
|
From: Milan M. <mil...@gm...> - 2007-06-22 11:58:03
|
Thomas Fjellstrom wrote:
> Index: include/alleggl.h
> ===================================================================
> --- include/alleggl.h (revision 1240)
> +++ include/alleggl.h (working copy)
> @@ -68,7 +68,7 @@
> #include "allegrogl/gl_ext.h"
>
> #ifdef ALLEGRO_WITH_XWINDOWS
> -#ifndef HAVE_LIBPTHREAD
> +#ifndef ALLEGRO_HAVE_LIBPTHREAD
> # error AllegroGL requires Allegro to have pthread support enabled!
> #endif
> #include <alleggl_config.h>
>
> Yup. AGL source is now broken on allegro svn and any future releases.
Is with this patch AGL broken on allegro 4.2.1 and older? Should we keep
both HAVE_LIBPTHREAD and ALLEGRO_HAVE_LIBPTHREAD?
like:
#ifdef ALLEGRO_WITH_XWINDOWS
#if GET_ALLEGRO_VERSION() <= MAKE_VER(4, 2, 1)
#ifndef HAVE_LIBPTHREAD
# error AllegroGL requires Allegro to have pthread support enabled!
#endif
#else
#ifndef ALLEGRO_HAVE_LIBPTHREAD
# error AllegroGL requires Allegro to have pthread support enabled!
#endif
#endif
#endif
--
Milan Mimica
http://sparklet.sf.net
|
|
From: Thomas F. <tfj...@st...> - 2007-06-22 15:19:20
|
On June 22, 2007, Milan Mimica wrote: > Thomas Fjellstrom wrote: > > Index: include/alleggl.h > > =================================================================== > > --- include/alleggl.h (revision 1240) > > +++ include/alleggl.h (working copy) > > @@ -68,7 +68,7 @@ > > #include "allegrogl/gl_ext.h" > > > > #ifdef ALLEGRO_WITH_XWINDOWS > > -#ifndef HAVE_LIBPTHREAD > > +#ifndef ALLEGRO_HAVE_LIBPTHREAD > > # error AllegroGL requires Allegro to have pthread support enabled! > > #endif > > #include <alleggl_config.h> > > > > > > Yup. AGL source is now broken on allegro svn and any future releases. > > Is with this patch AGL broken on allegro 4.2.1 and older? Should we keep > both HAVE_LIBPTHREAD and ALLEGRO_HAVE_LIBPTHREAD? Its 4.2.2 (4.2.1-svn) and older. The change was made earlier this week. > like: > #ifdef ALLEGRO_WITH_XWINDOWS > #if GET_ALLEGRO_VERSION() <= MAKE_VER(4, 2, 1) > #ifndef HAVE_LIBPTHREAD > # error AllegroGL requires Allegro to have pthread support > enabled! #endif > #else > #ifndef ALLEGRO_HAVE_LIBPTHREAD > # error AllegroGL requires Allegro to have pthread support > enabled! #endif > #endif > #endif Probably is necessary. -- Thomas Fjellstrom tfj...@st... |
|
From: Milan M. <mil...@gm...> - 2007-06-22 16:05:38
|
Thomas Fjellstrom wrote: > > Its 4.2.2 (4.2.1-svn) and older. The change was made earlier this week. > >> like: >> #ifdef ALLEGRO_WITH_XWINDOWS >> #if GET_ALLEGRO_VERSION() <= MAKE_VER(4, 2, 1) >> #ifndef HAVE_LIBPTHREAD >> # error AllegroGL requires Allegro to have pthread support >> enabled! #endif >> #else >> #ifndef ALLEGRO_HAVE_LIBPTHREAD >> # error AllegroGL requires Allegro to have pthread support >> enabled! #endif >> #endif >> #endif > > Probably is necessary. Then I'm going to apply such patch that keeps AGL compatible with allegro version < 4.2.2. -- Milan Mimica http://sparklet.sf.net |
|
From: Milan M. <mil...@gm...> - 2007-06-25 13:16:19
|
Milan Mimica wrote: > > Then I'm going to apply such patch that keeps AGL compatible with > allegro version < 4.2.2. > Commited this one: --- trunk/include/alleggl.h 2007-06-05 08:30:07 UTC (rev 1240) +++ trunk/include/alleggl.h 2007-06-25 13:13:08 UTC (rev 1241) @@ -68,8 +68,14 @@ #include "allegrogl/gl_ext.h" #ifdef ALLEGRO_WITH_XWINDOWS -#ifndef HAVE_LIBPTHREAD -# error AllegroGL requires Allegro to have pthread support enabled! +#if (ALLEGRO_SUB_VERSION == 2) && (ALLEGRO_WIP_VERSION < 2) +# ifndef HAVE_LIBPTHREAD +# error AllegroGL requires Allegro to have pthread support enabled! +# endif +#else +# ifndef ALLEGRO_HAVE_LIBPTHREAD +# error AllegroGL requires Allegro to have pthread support enabled! +# endif #endif #include <alleggl_config.h> #endif -- Milan Mimica http://sparklet.sf.net |
|
From: Elias P. <el...@us...> - 2007-06-22 15:25:53
|
On Fri, 2007-06-22 at 09:19 -0600, Thomas Fjellstrom wrote: > On June 22, 2007, Milan Mimica wrote: > > Thomas Fjellstrom wrote: > > > > > > Yup. AGL source is now broken on allegro svn and any future releases. > > > > Is with this patch AGL broken on allegro 4.2.1 and older? Should we keep > > both HAVE_LIBPTHREAD and ALLEGRO_HAVE_LIBPTHREAD? > > Its 4.2.2 (4.2.1-svn) and older. The change was made earlier this week. > Hm, what change is this? We can just undo it, 4.2.2 will be the latest 4.2.x release, and if everything goes by plan, 4.3.5 will have AGL included - so I don't see much point breaking AGL compatibility now - but I have no idea what this is about.. -- Elias Pschernig <el...@us...> |
|
From: Thomas F. <tfj...@st...> - 2007-06-22 15:37:06
|
On June 22, 2007, Elias Pschernig wrote: > On Fri, 2007-06-22 at 09:19 -0600, Thomas Fjellstrom wrote: > > On June 22, 2007, Milan Mimica wrote: > > > Thomas Fjellstrom wrote: > > > > Yup. AGL source is now broken on allegro svn and any future releases. > > > > > > Is with this patch AGL broken on allegro 4.2.1 and older? Should we > > > keep both HAVE_LIBPTHREAD and ALLEGRO_HAVE_LIBPTHREAD? > > > > Its 4.2.2 (4.2.1-svn) and older. The change was made earlier this week. > > Hm, what change is this? We can just undo it, 4.2.2 will be the latest > 4.2.x release, and if everything goes by plan, 4.3.5 will have AGL > included - so I don't see much point breaking AGL compatibility now - > but I have no idea what this is about.. Recently autoheader was dropped in allegro, and all the HAVE_* defines were renamed to ALLEGRO_HAVE_* to work around other libraries defining them as well. -- Thomas Fjellstrom tfj...@st... |
|
From: Elias P. <el...@us...> - 2007-06-22 16:10:21
|
On Fri, 2007-06-22 at 09:36 -0600, Thomas Fjellstrom wrote: > Recently autoheader was dropped in allegro, and all the HAVE_* defines were > renamed to ALLEGRO_HAVE_* to work around other libraries defining them as > well. > Ok, I see. -- Elias Pschernig <el...@us...> |