Fixes for Mingw

diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw
index 6244ded..886b344 100644 (file)
--- a/src/mesa/Makefile.mgw
+++ b/src/mesa/Makefile.mgw
@@ -154,7 +154,7 @@ DRIVER_SOURCES = \
 endif
 endif
 
-SOURCES = $(CORE_SOURCES) $(X86_SOURCES) $(COMMON_DRIVER_SOURCES) $(DRIVER_SOURCES)
+SOURCES = $(MESA_SOURCES) $(GLAPI_SOURCES) $(X86_SOURCES) $(DRIVER_SOURCES)
 
 OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
 

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 1aebb25..7f2fca7 100644 (file)
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -559,7 +559,7 @@ _mesa_pow(double x, double y)
 int
 _mesa_ffs(int i)
 {
-#if (defined(_WIN32) && !defined(__MINGW32__) ) || defined(__IBMC__) || defined(__IBMCPP__)
+#if (defined(_WIN32) ) || defined(__IBMC__) || defined(__IBMCPP__)
    register int bit = 0;
    if (i != 0) {
       if ((i & 0xffff) == 0) {