From 3f252ed3febad0910b204afbb8bbbf3e524ec580 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Thu, 15 Mar 2012 12:27:57 +0100 Subject: wimmel_gl: Allow compilation with -DGLUT --- Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Makefile') 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) -- cgit