ref: 2ea6c63520968847bc93e1a83a315667039a00d9
parent: 15e61552f600d48429f6871cbf544734294d25a3
author: menno <menno>
date: Mon Nov 24 16:51:32 EST 2008
FAAC linux build patches
--- a/common/mp4v2/Makefile.am
+++ b/common/mp4v2/Makefile.am
@@ -2,11 +2,11 @@
AM_CXXFLAGS = -Wall
-lib_LTLIBRARIES = libmp4v2.la
+noinst_LIBRARIES = libmp4v2.a
-include_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
+noinst_HEADERS = mp4.h mpeg4ip.h mpeg4ip_version.h mpeg4ip_config.h
-libmp4v2_la_SOURCES = \
+libmp4v2_a_SOURCES = \
3gp.cpp \
atom_bitr.cpp \
atom_co64.cpp \
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@
AC_ARG_WITH( mp4v2, [ --with-mp4v2 compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=yes)
AC_ARG_ENABLE( drm, [ --enable-drm Digital Radio Mondiale support], enable_drm=$enableval, enable_drm=no)
-AC_DEFUN(MY_DEFINE, [ AC_DEFINE($1, 1, [define if needed]) ])
+AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ])
CFLAGS=${CFLAGS:-"-O2 -Wall"}--- a/frontend/Makefile.am
+++ b/frontend/Makefile.am
@@ -4,7 +4,7 @@
if WITH_MP4V2
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
-LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
+LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
else
INCLUDES = -I$(top_srcdir)/include
LDADD = $(top_builddir)/libfaac/libfaac.la -lm
--- a/frontend/faac.vcproj
+++ b/frontend/faac.vcproj
@@ -132,7 +132,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../include,../common/libsndfile/src,../common/getopt"
+ AdditionalIncludeDirectories="../common/mp4v2;../include,../common/libsndfile/src,../common/getopt"
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"