summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShane Blackett <shane@blackett.co.nz>2008-09-10 08:22:45 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-09-11 08:36:03 -0600
commitbc3b2a5d7a63c29602c35a4868942c20eb838338 (patch)
tree1876ed23b5078fac8a54e8d4cdb1c241aaba77f8
parent35fd72756a05463568d94862f4fcd234903e1204 (diff)
Fixes for Mingw
-rw-r--r--src/mesa/Makefile.mgw2
-rw-r--r--src/mesa/main/imports.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw
index 6244ded876..886b344ec9 100644
--- 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 1aebb25163..7f2fca7e1d 100644
--- 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) {