summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Borca <[email protected]>2003-10-22 11:33:14 +0000
committerDaniel Borca <[email protected]>2003-10-22 11:33:14 +0000
commite87d106d66619791c54c71908c957af1d869c6fc (patch)
tree311f3c4a12552e155165203ebca9a35eda170369
parent758cbc68de49ee7735611c1d50fc678698849731 (diff)
small fixes to accomodate Intel compiler/linker
-rw-r--r--src/mesa/Makefile.wfx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/Makefile.wfx b/src/mesa/Makefile.wfx
index afc17de199a..942de089135 100644
--- a/src/mesa/Makefile.wfx
+++ b/src/mesa/Makefile.wfx
@@ -90,7 +90,7 @@ LINK = link
AR = lib
AS = nasm
-CFLAGS = -G6 -c -D__MSC__ -D_MSC_VER=1200 -D_WIN32 -DWIN32 -DSTRICT -W3 #-WX -D__WIN32__
+CFLAGS = -nologo -G6 -c -D__MSC__ -D_MSC_VER=1200 -D_WIN32 -DWIN32 -DSTRICT -W3 #-WX -D__WIN32__
LFLAGS = -nologo /DLL /OPT:WIN98 /MACHINE:IX86 /NODEFAULTLIB #/SUBSYSTEM:WINDOWS,4.00
ARFLAGS = -nologo
ASFLAGS = -O2 -fwin32
@@ -386,7 +386,7 @@ x86\matypes.h: x86\gen_matypes.exe
x86\gen_matypes.exe > $@
x86\gen_matypes.exe: x86\gen_matypes.obj
- $(CC) -o $@ x86\gen_matypes.obj
+ $(LINK) -out:$@ -nologo x86\gen_matypes.obj
$(LIBDIR)\x86.lib: x86\matypes.h $(X86_OBJS)
$(AR) -out:$@ $(ARFLAGS) $(X86_OBJS)