diff options
| author | Shane Blackett <shane@blackett.co.nz> | 2008-09-10 08:23:19 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-09-10 08:23:19 -0600 |
| commit | 7b8d878bedc92feed1885ea57e6a69ebd4a72eb7 (patch) | |
| tree | 18fbd3762ab9bd524792eef7f19bbdf4a4471743 | |
| parent | 86ae34fbb4c27984a000ca501623c4fe6ceb0294 (diff) | |
| download | mesa-7b8d878bedc92feed1885ea57e6a69ebd4a72eb7.tar.gz | |
Fixes for Mingw
| -rw-r--r-- | src/mesa/Makefile.mgw | 2 | ||||
| -rw-r--r-- | src/mesa/main/imports.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw index 6244ded8768..886b344ec9b 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 1aebb25163f..7f2fca7e1da 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) { |