mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-06 02:20:11 +01:00
more MinGW fixes
This commit is contained in:
parent
76692c5ce2
commit
79fa6b9881
3 changed files with 7 additions and 7 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue