Mercurial > audlegacy-plugins
changeset 1780:2c64b6d44a3c
aac: Mk2
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Mon, 24 Sep 2007 11:46:50 -0500 |
| parents | 64d23e2cf6cc |
| children | 499656950801 |
| files | src/aac/Makefile src/aac/libfaad2/Makefile src/aac/mp4ff/Makefile src/aac/src/Makefile |
| diffstat | 4 files changed, 24 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aac/Makefile Mon Sep 24 11:40:08 2007 -0500 +++ b/src/aac/Makefile Mon Sep 24 11:46:50 2007 -0500 @@ -1,6 +1,3 @@ -include ../../mk/rules.mk -include ../../mk/init.mk +include ../../buildsys.mk SUBDIRS = mp4ff libfaad2 src - -include ../../mk/objective.mk
--- a/src/aac/libfaad2/Makefile Mon Sep 24 11:40:08 2007 -0500 +++ b/src/aac/libfaad2/Makefile Mon Sep 24 11:46:50 2007 -0500 @@ -1,13 +1,8 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk - -CFLAGS += -I../include -I../../.. -I. $(PICFLAGS) -Wall +include ../../../extra.mk -OBJECTIVE_LIBS_NOINST = libfaad.a +STATIC_LIB_NOINST = libfaad.a -LDFLAGS += -lm - -SOURCES = bits.c cfft.c decoder.c drc.c \ +SRCS = bits.c cfft.c decoder.c drc.c \ drm_dec.c error.c filtbank.c \ ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c \ ps_dec.c ps_syntax.c \ @@ -16,6 +11,9 @@ sbr_dct.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c \ sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c -OBJECTS = ${SOURCES:.c=.o} +include ../../../buildsys.mk -include ../../../mk/objective.mk +CPPFLAGS += -I../include -I../../.. -I. +CFLAGS += $(PLUGIN_CFLAGS) -Wall + +LIBS += -lm
--- a/src/aac/mp4ff/Makefile Mon Sep 24 11:40:08 2007 -0500 +++ b/src/aac/mp4ff/Makefile Mon Sep 24 11:46:50 2007 -0500 @@ -1,13 +1,10 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk +include ../../../extra.mk -OBJECTIVE_LIBS_NOINST = libmp4ff.a +STATIC_LIB_NOINST = libmp4ff.a -SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ +SRCS = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \ mp4tagupdate.c -OBJECTS = ${SOURCES:.c=.o} +include ../../../buildsys.mk -CFLAGS += $(PICFLAGS) -DUSE_TAGGING=1 -fsigned-char -I../../.. -Wall - -include ../../../mk/objective.mk +CFLAGS += $(PLUGIN_CFLAGS) -DUSE_TAGGING=1 -fsigned-char -I../../.. -Wall
--- a/src/aac/src/Makefile Mon Sep 24 11:40:08 2007 -0500 +++ b/src/aac/src/Makefile Mon Sep 24 11:46:50 2007 -0500 @@ -1,21 +1,19 @@ -include ../../../mk/rules.mk -include ../../../mk/init.mk +include ../../../extra.mk -OBJECTIVE_LIBS = libaac$(SHARED_SUFFIX) +PLUGIN = aac$(PLUGIN_SUFFIX) +plugindir = audacious/$(INPUT_PLUGIN_DIR) -CFLAGS += $(PICFLAGS) +SRCS = libmp4.c mp4_utils.c aac_utils.c tagging_mp4.c -# override objective make's LIBDIR -LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -LDFLAGS += ../libfaad2/libfaad.a ../mp4ff/libmp4ff.a -lstdc++ +include ../../../buildsys.mk -SOURCES = libmp4.c mp4_utils.c aac_utils.c tagging_mp4.c +CFLAGS += $(PLUGIN_CFLAGS) + +LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) +LIBS += ../libfaad2/libfaad.a ../mp4ff/libmp4ff.a -lstdc++ OBJECTS = ${SOURCES:.c=.o} LIBDEP = ../libfaad2/libfaad.a ../mp4ff/libmp4ff.a -CFLAGS += $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../.. -I../include -I../libfaad -I../mp4ff -Wall - -include ../../../mk/objective.mk +CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../.. -I../include -I../libfaad -I../mp4ff -Wall