summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorZhang <zxpmyth@yahoo.com.cn>2007-07-27 11:19:35 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-07-27 11:19:35 -0600
commit35f35294cd5cc3ca32354b1de0e398ad73c70716 (patch)
tree5f495f0672e26d59a39bbcf8f3f1fc8151a22432 /progs
parent0fb0d9715c9bcdcc3437a64a0f03c1c1153e9f29 (diff)
more Mingw32 fixes
Diffstat (limited to 'progs')
-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 3b2fd785de..8bb975be9d 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)