Mesa (master): osmesa: Fix Mingw build.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Sat Apr 23 04:43:26 PDT 2011


Module: Mesa
Branch: master
Commit: 4c92f3fa6ebe01628546617f91da3b3c10572b16
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c92f3fa6ebe01628546617f91da3b3c10572b16

Author: José Fonseca <jose.r.fonseca at gmail.com>
Date:   Sat Apr 23 12:23:42 2011 +0100

osmesa: Fix Mingw build.

Build as

  scons platform=windows osmesa

---

 src/mesa/drivers/osmesa/osmesa.c |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 98f01fe..68d7114 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
 
 
 



More information about the mesa-commit mailing list