From a69ef34640aa37f886b94631f7c2a91baa56a644 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Mon, 19 Apr 2010 20:25:17 -0700 Subject: egl: Fix demos to build with user specified Xlib Commit 88be2171e7 fixed the egl demos on the stable branch, but now they're spread out across multiple subdirectories. Signed-off-by: Dan Nicholson --- progs/egl/opengl/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'progs/egl/opengl') diff --git a/progs/egl/opengl/Makefile b/progs/egl/opengl/Makefile index 9a91df9906..20158b1f0b 100644 --- a/progs/egl/opengl/Makefile +++ b/progs/egl/opengl/Makefile @@ -4,7 +4,7 @@ TOP = ../../.. include $(TOP)/configs/current -INCLUDE_DIRS = -I$(TOP)/include +INCLUDE_DIRS = -I$(TOP)/include $(X11_CFLAGS) HEADERS = $(TOP)/include/GLES/egl.h LIB_DEP = $(TOP)/$(LIB_DIR)/libEGL.so @@ -73,7 +73,7 @@ $(foreach demo, $(EGLUT_DEMOS), $(eval $(call eglut-demo-rule,$(demo)))) # build EGLUT demos $(EGLUT_X11_DEMOS): - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(LIBS) -lX11 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(LIBS) $(X11_LIBS) $(EGLUT_SCREEN_DEMOS): $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(LIBS) -- cgit v1.2.3