diff options
| author | Michel Dänzer <[email protected]> | 2010-03-12 19:00:47 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2010-03-12 19:00:47 +0100 |
| commit | b13e305ee1a2454265fd957a99640a2e49507bea (patch) | |
| tree | e62dfd0ff761ec89de478499130d58d4b119aa0d /progs/xdemos | |
| parent | d1ca1599f0319f5c99852ce24420aa592e806db0 (diff) | |
| parent | 8561bec0ac1ae5a8871c86f1f2cc29d44cb0f878 (diff) | |
Merge branch '7.8'
Diffstat (limited to 'progs/xdemos')
| -rw-r--r-- | progs/xdemos/.gitignore | 7 | ||||
| -rw-r--r-- | progs/xdemos/Makefile | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/progs/xdemos/.gitignore b/progs/xdemos/.gitignore index a65b890d3dc..2f5e909079a 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 diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index 9cf984b59e5..e87d55d011e 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 \ |