summaryrefslogtreecommitdiff
path: root/progs/samples/Makefile.mgw
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2007-07-27 19:58:30 +0200
committerJulien Cristau <jcristau@debian.org>2007-07-27 19:58:30 +0200
commit04eee290c8dddfccf30376e60b525da136047492 (patch)
treee3a0e59857dc1d66cedef2cbeabde35dc000d19f /progs/samples/Makefile.mgw
parentd3a160e2174eafa68bbdbb0cf7955e23d26ea66b (diff)
parent121b4ac22072a0fbd2f3ed30cafe4e69403c72c2 (diff)
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
Diffstat (limited to 'progs/samples/Makefile.mgw')
-rw-r--r--progs/samples/Makefile.mgw21
1 files changed, 3 insertions, 18 deletions
diff --git a/progs/samples/Makefile.mgw b/progs/samples/Makefile.mgw
index 3b2fd785def..8bb975be9da 100644
--- a/progs/samples/Makefile.mgw
+++ b/progs/samples/Makefile.mgw
@@ -53,14 +53,9 @@
TOP = ../..
-include $(TOP)/configs/config.mgw
-ALL_USING_STDCALL ?= 1
-GL_USING_STDCALL ?= 1
-GLUT_USING_STDCALL ?= 1
-
CC = mingw32-gcc
CFLAGS = -Wall -pedantic
-CFLAGS += -O2 -ffast-math
+CFLAGS += -O2 -ffast-math -D_DLL
CFLAGS += -I$(TOP)/include -I../util
ifeq ($(FX),1)
CFLAGS += -DFX
@@ -68,17 +63,6 @@ endif
CFLAGS += -DGLUT_DISABLE_ATEXIT_HACK
-ifeq ($(GL_USING_STDCALL),0)
- CFLAGS += -DGL_NO_STDCALL
-endif
-
-ifeq ($(GLUT_USING_STDCALL),1)
- CFLAGS += -D_STDCALL_SUPPORTED
-else
- CFLAGS += -DGLUT_NO_STDCALL
-endif
-
-
LD = mingw32-g++
LDFLAGS = -s -L$(TOP)/lib
@@ -87,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)