diff options
| author | Dan Nicholson <[email protected]> | 2010-04-19 20:25:17 -0700 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2010-04-19 20:25:17 -0700 |
| commit | a69ef34640aa37f886b94631f7c2a91baa56a644 (patch) | |
| tree | 1e8ef093922d3b0e9cd28ecabb722bedf1753529 /progs/egl/opengl | |
| parent | 02224ec4e0de8072c9d730821f88e0a00212ff50 (diff) | |
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 <[email protected]>
Diffstat (limited to 'progs/egl/opengl')
| -rw-r--r-- | progs/egl/opengl/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/egl/opengl/Makefile b/progs/egl/opengl/Makefile index 9a91df99064..20158b1f0bc 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) |