diff options
| -rw-r--r-- | src/mesa/Makefile.mgw | 8 | ||||
| -rw-r--r-- | src/mesa/glapi/glx86asm.py | 4 | ||||
| -rw-r--r-- | src/mesa/x86/glapi_x86.S | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw index 0834908..33ea665 100644 --- a/src/mesa/Makefile.mgw +++ b/src/mesa/Makefile.mgw @@ -335,10 +335,10 @@ x86/gen_matypes.exe: x86/gen_matypes.c $(CC) -o $@ $(CFLAGS) -s $< # [dBorca] Hack alert: -# use standard API, to work around Win32 @x names -# also glapi_x86.S is protected against __WIN32__ -main/dispatch.o: main/dispatch.c - $(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $< +# glapi_x86.S needs some adjustments +# in order to generate correct entrypoints +x86/glapi_x86.o: x86/glapi_x86.S + $(CC) -o $@ $(CFLAGS) -U__WIN32__ -DSTDCALL_API -c $< clean: -$(call UNLINK,array_cache/*.o) diff --git a/src/mesa/glapi/glx86asm.py b/src/mesa/glapi/glx86asm.py index f070c23..c061e46 100644 --- a/src/mesa/glapi/glx86asm.py +++ b/src/mesa/glapi/glx86asm.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# $Id: glx86asm.py,v 1.8 2003/10/22 21:02:15 kendallb Exp $ +# $Id: glx86asm.py,v 1.9 2003/10/23 13:28:06 dborca Exp $ # Mesa 3-D graphics library # Version: 4.1 @@ -54,7 +54,7 @@ def PrintHead(): print '' print '#define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))' print '' - print '#if defined(GNU_ASSEMBLER) && !defined(DJGPP)' + print '#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)' print '#define GLOBL_FN(x) GLOBL x ; .type x,@function' print '#else' print '#define GLOBL_FN(x) GLOBL x' diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S index 9f79438..6ad65e6 100644 --- a/src/mesa/x86/glapi_x86.S +++ b/src/mesa/x86/glapi_x86.S @@ -14,7 +14,7 @@ #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) -#if defined(GNU_ASSEMBLER) && !defined(DJGPP) +#if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) #define GLOBL_FN(x) GLOBL x ; .type x,@function #else #define GLOBL_FN(x) GLOBL x |