From 978706042317edd9fde90e613cc73d87ddd7d7b8 Mon Sep 17 00:00:00 2001 From: Jeff Smith Date: Tue, 9 Mar 2010 12:40:44 -0600 Subject: Add -L$(libdir) for xdemos and egl so that the right libX11 is found Signed-off-by: Jeff Smith Signed-off-by: Brian Paul --- progs/xdemos/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'progs/xdemos') diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index 9cf984b59e..e87d55d011 100644 --- a/progs/xdemos/Makefile +++ b/progs/xdemos/Makefile @@ -11,7 +11,7 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) # Add X11 and pthread libs to satisfy GNU gold. APP_LIB_DEPS += -lX11 -lpthread -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS) PROGS = \ corender \ -- cgit v1.2.3 From 3aa86928838f65e7f9896bae39ffc966d2df2d73 Mon Sep 17 00:00:00 2001 From: Jeff Smith Date: Fri, 2 Mar 2007 00:14:48 -0600 Subject: Add programs to .gitignore in xdemos Signed-off-by: Jeff Smith Signed-off-by: Brian Paul --- progs/xdemos/.gitignore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'progs/xdemos') diff --git a/progs/xdemos/.gitignore b/progs/xdemos/.gitignore index a65b890d3d..2f5e909079 100644 --- a/progs/xdemos/.gitignore +++ b/progs/xdemos/.gitignore @@ -13,11 +13,14 @@ glxpixmap glxsnoop glxswapcontrol manywin +msctest multictx offset +omlsync overlay -pbdemo pbinfo +pbdemo +shape sharedtex sharedtex_mt texture_from_pixmap @@ -26,5 +29,3 @@ xdemo xfont xrotfontdemo yuvrect_client -msctest -omlsync -- cgit v1.2.3