util: Fix descriptors for R32_FLOAT and R32G32_FLOAT formats.

[mesa.git] / progs / samples / Makefile.mgw

diff --git a/progs/samples/Makefile.mgw b/progs/samples/Makefile.mgw
index 54dbfb706ad8ed1738d914d698e60d503660a10c..8bb975be9da0affd08ed386fdb09657a0768f49c 100644 (file)
--- a/progs/samples/Makefile.mgw
+++ b/progs/samples/Makefile.mgw
@@ -26,13 +26,20 @@
 #  Email : dborca@users.sourceforge.net
 #  Web   : http://www.geocities.com/dborca
 
+# MinGW samples makefile updated for Mesa 7.0
+#
+#  Updated : by Heromyth, on 2007-7-21
+#  Email   : zxpmyth@yahoo.com.cn
+#  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
+#            The others havn't been tested yet.
+#            2) The generated DLLs are *not* compatible with the ones built
+#            with the other compilers like VC8, especially for GLUT. 
+#            3) Although more tests are needed, it can be used individually!
 
 #
 #  Available options:
 #
 #    Environment variables:
-#      CPU             optimize for the given processor.
-#                      default = pentium
 #
 #    Targets:
 #      <file.exe>      build a specific file
@@ -45,17 +52,16 @@
 .SECONDARY: ../util/readtex.o ../util/showbuffer.o
 
 TOP = ../..
-CPU ?= pentium
 
 CC = mingw32-gcc
-CFLAGS = -Wall -W -pedantic
-CFLAGS += -O2 -ffast-math -mtune=$(CPU)
+CFLAGS = -Wall -pedantic
+CFLAGS += -O2 -ffast-math -D_DLL
 CFLAGS += -I$(TOP)/include -I../util
 ifeq ($(FX),1)
-CFLAGS += -DFX
+  CFLAGS += -DFX
 endif
-CFLAGS += -DGLUT_DISABLE_ATEXIT_HACK -D_STDCALL_SUPPORTED
-CFLAGS += -D_WINDEF_ -D_WINGDI_
+
+CFLAGS += -DGLUT_DISABLE_ATEXIT_HACK
 
 LD = mingw32-g++
 LDFLAGS = -s -L$(TOP)/lib
@@ -65,7 +71,8 @@ LDLIBS = -lglut32 -lglu32 -lopengl32
 .c.o:
        $(CC) -o $@ $(CFLAGS) -c $<
 %.exe: ../util/readtex.o ../util/showbuffer.o %.o
-       $(LD) -o $@ $(LDFLAGS) $^ $(LDLIBS)
+       $(LD) -o $@ $(LDFLAGS) $(LDLIBS) $^
+
 
 all:
        $(error Must specify <filename.exe> to build)