Re: [AD] [AL] Cannot compile 4.1.2 with MSVC 6

[Robert Ohannessian <ohannessian@xxxxxxxxxx>]

Chris La Mantia wrote:

> When I try tocompile Allegro 4.1.2 with MSVC 6, I get:
>
> d:/djgpp/bin/make.exe msg lib install
> make.exe[1]: Entering directory `d:/djgpp/allegro'
> Compiling Allegro for MSVC, optimised. Please wait...

Here's a patch for it. Tested with MSVC 6

If it works for you, I'll apply it on CVS. Eric, we may need to make a 
4.1.2b release...

Index: poly3d.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/poly3d.c,v
retrieving revision 1.25
diff -u -b -r1.25 poly3d.c
--- poly3d.c	12 Sep 2002 16:23:57 -0000	1.25
+++ poly3d.c	22 Sep 2002 16:13:18 -0000
@@ -1713,16 +1713,17 @@
  */
 void quad3d(BITMAP *bmp, int type, BITMAP *texture, V3D *v1, V3D *v2, V3D *v3, V3D *v4)
 {
-   ASSERT(bmp);
    #if (defined ALLEGRO_GCC) && (defined ALLEGRO_I386)
+      ASSERT(bmp);
 
       /* dodgy assumption alert! See comments for triangle() */
       polygon3d(bmp, type, texture, 4, &v1);
 
    #else
-
       V3D *vertex[4];
 
+      ASSERT(bmp);
+
       vertex[0] = v1;
       vertex[1] = v2;
       vertex[2] = v3;
@@ -1739,8 +1740,8 @@
  */
 void quad3d_f(BITMAP *bmp, int type, BITMAP *texture, V3D_f *v1, V3D_f *v2, V3D_f *v3, V3D_f *v4)
 {
-   ASSERT(bmp);
    #if (defined ALLEGRO_GCC) && (defined ALLEGRO_I386)
+      ASSERT(bmp);
 
       /* dodgy assumption alert! See comments for triangle() */
       polygon3d_f(bmp, type, texture, 4, &v1);
@@ -1748,6 +1749,7 @@
    #else
 
       V3D_f *vertex[4];
+      ASSERT(bmp);
 
       vertex[0] = v1;
       vertex[1] = v2;