diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2010-04-19 20:25:17 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-04-19 20:25:17 -0700 |
| commit | a69ef34640aa37f886b94631f7c2a91baa56a644 (patch) | |
| tree | 1e8ef093922d3b0e9cd28ecabb722bedf1753529 /progs | |
| 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 <dbn.lists@gmail.com>
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/egl/eglut/Makefile | 3 | ||||
| -rw-r--r-- | progs/egl/opengl/Makefile | 4 | ||||
| -rw-r--r-- | progs/egl/opengles1/Makefile | 5 | ||||
| -rw-r--r-- | progs/egl/opengles2/Makefile | 3 | ||||
| -rw-r--r-- | progs/egl/openvg/Makefile | 6 |
5 files changed, 12 insertions, 9 deletions
diff --git a/progs/egl/eglut/Makefile b/progs/egl/eglut/Makefile index f5cafa70104..dec89117bb9 100644 --- a/progs/egl/eglut/Makefile +++ b/progs/egl/eglut/Makefile @@ -4,7 +4,8 @@ TOP = ../../.. include $(TOP)/configs/current INCLUDES = \ - -I$(TOP)/include + -I$(TOP)/include \ + $(X11_CFLAGS) SOURCES = $(wildcard *.c) 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) diff --git a/progs/egl/opengles1/Makefile b/progs/egl/opengles1/Makefile index 554cff9e6b6..ba9d1b84d5f 100644 --- a/progs/egl/opengles1/Makefile +++ b/progs/egl/opengles1/Makefile @@ -6,6 +6,7 @@ include $(TOP)/configs/current INCLUDE_DIRS = \ -I$(TOP)/include \ + $(X11_CFLAGS) HEADERS = $(TOP)/include/GLES/egl.h @@ -17,7 +18,7 @@ ES1_LIB_DEPS = \ ES1_LIBS = \ -L$(TOP)/$(LIB_DIR) -lEGL \ - -L$(TOP)/$(LIB_DIR) -lGLESv1_CM $(LIBDRM_LIB) -lX11 + -L$(TOP)/$(LIB_DIR) -lGLESv1_CM $(LIBDRM_LIB) $(X11_LIBS) EGLUT_DIR = $(TOP)/progs/egl/eglut @@ -91,7 +92,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-$* $(ES1_LIBS) -lX11 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(ES1_LIBS) $(X11_LIBS) $(EGLUT_SCREEN_DEMOS): $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(ES1_LIBS) diff --git a/progs/egl/opengles2/Makefile b/progs/egl/opengles2/Makefile index 710c4d8c130..1ee2af24127 100644 --- a/progs/egl/opengles2/Makefile +++ b/progs/egl/opengles2/Makefile @@ -6,6 +6,7 @@ include $(TOP)/configs/current INCLUDE_DIRS = \ -I$(TOP)/include \ + $(X11_CFLAGS) HEADERS = $(TOP)/include/GLES/egl.h @@ -17,7 +18,7 @@ ES2_LIB_DEPS = \ ES2_LIBS = \ -L$(TOP)/$(LIB_DIR) -lEGL \ - -L$(TOP)/$(LIB_DIR) -lGLESv2 $(LIBDRM_LIB) -lX11 + -L$(TOP)/$(LIB_DIR) -lGLESv2 $(LIBDRM_LIB) $(X11_LIBS) PROGRAMS = \ es2_info \ diff --git a/progs/egl/openvg/Makefile b/progs/egl/openvg/Makefile index 3683cb7814a..431341c8a3f 100644 --- a/progs/egl/openvg/Makefile +++ b/progs/egl/openvg/Makefile @@ -4,7 +4,7 @@ TOP = ../../.. include $(TOP)/configs/current VG_LIBS=-lm -lEGL -lOpenVG -L$(TOP)/lib -L$(TOP)/lib/gallium -INCLUDE_DIRS = -I$(TOP)/include +INCLUDE_DIRS = -I$(TOP)/include $(X11_CFLAGS) EGLUT_DIR = $(TOP)/progs/egl/eglut @@ -27,7 +27,7 @@ default: $(PROGRAMS) $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS) lion_x11: lion.o lion-render.o $(EGLUT_DIR)/libeglut-x11.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lion.o lion-render.o \ - -L$(EGLUT_DIR) -leglut-x11 $(VG_LIBS) -lX11 + -L$(EGLUT_DIR) -leglut-x11 $(VG_LIBS) $(X11_LIBS) lion_screen: lion.o lion-render.o $(EGLUT_DIR)/libeglut-screen.a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ lion.o lion-render.o \ @@ -45,7 +45,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-$* $(VG_LIBS) -lX11 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(VG_LIBS) $(X11_LIBS) $(EGLUT_SCREEN_DEMOS): $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L$(EGLUT_DIR) -leglut-$* $(VG_LIBS) |