From 853d571d482e7cea45655c9e310f305c8637d124 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 15 Sep 2008 15:34:26 +0000
Subject: Use standard -I flags to compile codec-cfg.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27618 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index bdf3705935..71f7b10905 100644
--- a/Makefile
+++ b/Makefile
@@ -752,7 +752,7 @@ mplayer$(EXESUF): $(MPLAYER_DEPS)
 	$(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
 
 codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
-	$(HOST_CC) -O -I. -DCODECS2HTML -o $@ $<
+	$(HOST_CC) -O -DCODECS2HTML $(EXTRA_INC) -o $@ $<
 
 codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
 	./$^ > $@
-- 
cgit v1.2.3


From a5e9a8d0cac5eb5a40ce9df6f1a635a779064233 Mon Sep 17 00:00:00 2001
From: rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 15 Sep 2008 16:32:31 +0000
Subject: External liba52 support, part 2 of 2.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27620 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 71f7b10905..8cf984c210 100644
--- a/Makefile
+++ b/Makefile
@@ -294,8 +294,8 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += libaf/af_export.c osdep/mmap_anon.c
 SRCS_COMMON-$(JPEG)                  += libmpcodecs/vd_ijpg.c
 SRCS_COMMON-$(LADSPA)                += libaf/af_ladspa.c
 SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_hwac3.c \
-                                        libmpcodecs/ad_liba52.c \
-                                        liba52/crc.c \
+                                        libmpcodecs/ad_liba52.c
+SRCS_COMMON-$(LIBA52_INTERNAL)       += liba52/crc.c \
                                         liba52/resample.c \
                                         liba52/bit_allocate.c \
                                         liba52/bitstream.c \
-- 
cgit v1.2.3


From c8d9bf0f50c40f54cc183434421dd799daa71689 Mon Sep 17 00:00:00 2001
From: rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 16 Sep 2008 22:30:22 +0000
Subject: Add shared libswscale support.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27632 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8cf984c210..81f0ee487a 100644
--- a/Makefile
+++ b/Makefile
@@ -634,7 +634,7 @@ COMMON_LIBS-$(LIBAVFORMAT_A)      += libavformat/libavformat.a
 COMMON_LIBS-$(LIBAVCODEC_A)       += libavcodec/libavcodec.a
 COMMON_LIBS-$(LIBAVUTIL_A)        += libavutil/libavutil.a
 COMMON_LIBS-$(LIBPOSTPROC_A)      += libpostproc/libpostproc.a
-COMMON_LIBS  = libswscale/libswscale.a
+COMMON_LIBS-$(LIBSWSCALE_A)       += libswscale/libswscale.a
 COMMON_LIBS += $(COMMON_LIBS-yes)
 
 OBJS_COMMON    += $(addsuffix .o, $(basename $(SRCS_COMMON)))
-- 
cgit v1.2.3