From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Sat, 23 Apr 2011 11:23:42 +0000 (+0100)
Subject: osmesa: Fix Mingw build.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4c92f3fa6ebe01628546617f91da3b3c10572b16;p=mesa.git

osmesa: Fix Mingw build.

Build as

  scons platform=windows osmesa
---

diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 98f01fe057e..68d71144642 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -515,11 +515,7 @@ do {								\
    PACK_RGBA(p, color[0], color[1], color[2], color[3]);	\
 } while (0)
 
-#ifdef WIN32
-#include "..\swrast\s_linetemp.h"
-#else
 #include "swrast/s_linetemp.h"
-#endif
 
 
 
@@ -544,11 +540,7 @@ do {							\
    }							\
 } while (0)
 
-#ifdef WIN32
-#include "..\swrast\s_linetemp.h"
-#else
 #include "swrast/s_linetemp.h"
-#endif
 
 
 
@@ -624,11 +616,7 @@ osmesa_choose_line_function( struct gl_context *ctx )
       span.z += span.zStep;					\
    }                                                            \
 }
-#ifdef WIN32
-#include "..\swrast\s_tritemp.h"
-#else
 #include "swrast/s_tritemp.h"
-#endif
 
 
 
@@ -656,11 +644,8 @@ osmesa_choose_line_function( struct gl_context *ctx )
       span.z += span.zStep;				\
    }                                                    \
 }
-#ifdef WIN32
-#include "..\swrast\s_tritemp.h"
-#else
+
 #include "swrast/s_tritemp.h"
-#endif