Mercurial > audlegacy-plugins
changeset 118:71574bb264d0 trunk
[svn] - link against needed libs
| author | nenolod |
|---|---|
| date | Wed, 25 Oct 2006 00:02:27 -0700 |
| parents | 614e390341f4 |
| children | b8fd91c53d9b |
| files | ChangeLog configure.ac mk/rules.mk.in src/iris/Makefile |
| diffstat | 4 files changed, 20 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 24 23:45:14 2006 -0700 +++ b/ChangeLog Wed Oct 25 00:02:27 2006 -0700 @@ -1,3 +1,11 @@ +2006-10-25 06:45:14 +0000 William Pitcock <nenolod@nenolod.net> + revision [234] + - link against libGL + + trunk/src/iris/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2006-10-25 04:25:31 +0000 William Pitcock <nenolod@nenolod.net> revision [232] - iris vis plugin port
--- a/configure.ac Tue Oct 24 23:45:14 2006 -0700 +++ b/configure.ac Wed Oct 25 00:02:27 2006 -0700 @@ -833,7 +833,14 @@ ) if test "$enable_iris" = "yes"; then - VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS iris" + PKG_CHECK_MODULES(XXF86VM, [xxf86vm >= 1.0.0], + [enable_iris=yes + VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS iris"], + [enable_iris=no] + ) +else + AC_MSG_RESULT([*** Iris plugin disabled per user request ***]) + enable_iris=no fi dnl FreeBSD newpcm driver detection
--- a/mk/rules.mk.in Tue Oct 24 23:45:14 2006 -0700 +++ b/mk/rules.mk.in Wed Oct 25 00:02:27 2006 -0700 @@ -333,3 +333,5 @@ AUDLDFLAGS ?= @AUDLDFLAGS@ WAVPACK_CFLAGS ?= @WAVPACK_CFLAGS@ WAVPACK_LIBS ?= @WAVPACK_LIBS@ +XXF86VM_CFLAGS ?= @XFF86VM_CFLAGS@ +XXF86VM_LIBS ?= @XFF86VM_LIBS@
--- a/src/iris/Makefile Tue Oct 24 23:45:14 2006 -0700 +++ b/src/iris/Makefile Wed Oct 25 00:02:27 2006 -0700 @@ -5,7 +5,7 @@ LIBDIR = $(plugindir)/$(VISUALIZATION_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) -lGL +LIBADD = $(GTK_LIBS) -lGL $(XXF86VM_LIBS) SOURCES = \ 3Dstuff.c \ @@ -29,6 +29,6 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) -D_REENTRANT $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) -D_REENTRANT $(GTK_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. $(XXF86VM_CFLAGS) include ../../mk/objective.mk