summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2012-03-15 12:27:57 +0100
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2012-03-15 12:27:57 +0100
commit3f252ed3febad0910b204afbb8bbbf3e524ec580 (patch)
tree2bbc03892a8fe676b867292ee0af81d1997a24e9 /Makefile
parent1f87f492ec1680ad3144b84219c27d2127459b50 (diff)
downloadcv-3f252ed3febad0910b204afbb8bbbf3e524ec580.tar.gz
cv-3f252ed3febad0910b204afbb8bbbf3e524ec580.tar.bz2
cv-3f252ed3febad0910b204afbb8bbbf3e524ec580.zip
wimmel_gl: Allow compilation with -DGLUT
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 3ebb15c..0156d6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
CC = gcc
-CFLAGS = -ggdb -std=c99 -pedantic -Wall \
+CFLAGS = -ggdb -std=c99 -pedantic -Wall $(DEFINES) \
$(shell pkg-config --cflags gdk-pixbuf-2.0 glib-2.0 gthread-2.0) \
-DN_THREADS=$(shell grep -c ^processor /proc/cpuinfo || echo 2)
-LDFLAGS = -lm \
+LDFLAGS = $(LIBS) -lm \
$(shell pkg-config --libs gdk-pixbuf-2.0 glib-2.0 gthread-2.0)
PROGS = wimmel wimmel_gl
@@ -23,9 +23,7 @@ wimmel_gl: wimmel_gl.o util.o
wimmel_gl:
- $(CC) `pkg-config --cflags --libs gtk+-2.0 glib-2.0 egl gl` -o $@ $+
-
-
+ $(CC) $(LDFLAGS) `pkg-config --cflags --libs egl gl` -o $@ $+
clean:
rm -f $(PROGS) $(OBJS)