Re: [AD] CVS: allegro/include/allegro/platform al386gcc.h,1.2,1.3al386vc.h,1.2,1.3al386wat.h,1.2,1.3 alqnxcfg.h,1.4,1.5 alucfg.h,1.2,1.3

[Stepan Roh <stepan@xxxxxxxxxx>]

On Sun, 2 Dec 2001, Peter Wang wrote:

> On 2001-12-01, Stepan Roh <stepan@xxxxxxxxxx> wrote:
> > On Sun, 2 Dec 2001, Peter Wang wrote:
> >
> > > On 2001-12-01, Stepan Roh <stepan@xxxxxxxxxx> wrote:
> > > >
> > > > I'm doing tests as I said earlier and it's nice that you, Peter, prefixed
> > > > fixed classes, but now there is no way how to build Allegro on Irix.
> > > > Backward compatibility must be disabled for library itself.
> > >
> > > For building the library itself only, or for user programs too? I'm
> > > not sure I follow.  It's probably best just to send a patch.
> >
> > I have no patch (I have no time right now). But library and examples and
> > tests and tools etc. must be built using ALLEGRO_NO_FIX_ALIASES or lib
> > won't compile. I solved by adding #define ALLEGRO_NO_FIX_ALIASES on top of
> > allegro.h, but it's only a quick'n'dirty solution. Another solution would
> > be to not include alcompat.h when building library and realted progs. But
> > in both cases, some kind of ALLEGRO_LIBRARY_BUILD should be defined from
> > makefile when building library, which will trigger #define
> > ALLEGRO_NO_FIX_ALIASES or will disable including of alcompat.h. Hope, this
> > clears it, I'm in a hurry :-) Oh, !@#$, I'm late :-)
>
> So the attached patch is ok?

Yes, it's ok, but I'd like to see something like the patch attached
(untested), which is more general (although right now only for *nix).

Have a nice day.

Stepan Roh

Index: configure.in
===================================================================
RCS file: /cvsroot/alleg/allegro/configure.in,v
retrieving revision 1.30
diff -u -r1.30 configure.in
--- configure.in	2001/11/30 13:43:29	1.30
+++ configure.in	2001/12/02 13:24:18
@@ -184,6 +184,7 @@
   ALLEGRO_SFLAGS=
   ALLEGRO_SHAREDLIB_CFLAGS=
 fi
+CFLAGS="$CFLAGS -DALLEGRO_LIB_BUILD"
 
 AC_SUBST(CFLAGS)
 AC_SUBST(ALLEGRO_DEBUG_CFLAGS)
Index: include/allegro.h
===================================================================
RCS file: /cvsroot/alleg/allegro/include/allegro.h,v
retrieving revision 1.76
diff -u -r1.76 allegro.h
--- include/allegro.h	2001/12/01 13:32:51	1.76
+++ include/allegro.h	2001/12/02 13:24:23
@@ -61,7 +61,9 @@
 #include "allegro/3d.h"
 #include "allegro/3dmaths.h"
 
-#include "allegro/alcompat.h"
+#ifndef ALLEGRO_LIB_BUILD
+   #include "allegro/alcompat.h"
+#endif
 
 
 #ifdef ALLEGRO_EXTRA_HEADER
Index: include/allegro/alinline.h
===================================================================
RCS file: /cvsroot/alleg/allegro/include/allegro/alinline.h,v
retrieving revision 1.29
diff -u -r1.29 alinline.h
--- include/allegro/alinline.h	2001/11/10 21:16:13	1.29
+++ include/allegro/alinline.h	2001/12/02 13:24:23
@@ -34,4 +34,6 @@
 
 #include "inline/matrix.inl"
 
-#include "alcompat.h"
+#ifndef ALLEGRO_LIB_BUILD
+   #include "alcompat.h"
+#endif