aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar lucabe <lucabe@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-30 12:00:31 +0000
committerGravatar lucabe <lucabe@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-30 12:00:31 +0000
commitcc30aae17bf521fc5453c7ee173cceefde255faf (patch)
treee88e8921f811ae85227b451ce739a0b9d49db9f8 /Makefile
parent6ff1b359593595622d6f231fb3d5ff53e63cfa3d (diff)
Move postproc ---> libswscale
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18866 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 8c4f0fbe93..7bec636b85 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
$(W32_LIB) \
libaf/libaf.a \
libmpdemux/libmpdemux.a \
- postproc/libswscale.a \
+ libswscale/libswscale.a \
osdep/libosdep.a \
$(DVDREAD_LIB) \
$(DVDNAV_LIB) \
@@ -163,9 +163,9 @@ PARTS = libmpdemux \
libavcodec \
libpostproc \
libavformat \
+ libswscale \
libao2 \
osdep \
- postproc \
input \
libvo \
libaf \
@@ -218,7 +218,7 @@ COMMON_DEPS = $(W32_DEP) \
libmpcodecs/libmpcodecs.a \
libao2/libao2.a \
osdep/libosdep.a \
- postproc/libswscale.a \
+ libswscale/libswscale.a \
input/libinput.a \
libvo/libvo.a \
libaf/libaf.a \
@@ -302,6 +302,9 @@ libpostproc/libpostproc.a:
libavformat/libavformat.a:
$(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a
+libswscale/libswscale.a:
+ $(MAKE) -C libswscale
+
libmpeg2/libmpeg2.a:
$(MAKE) -C libmpeg2
@@ -335,9 +338,6 @@ Gui/libgui.a:
osdep/libosdep.a:
$(MAKE) -C osdep
-postproc/libswscale.a:
- $(MAKE) -C postproc
-
input/libinput.a:
$(MAKE) -C input
@@ -583,7 +583,7 @@ libmpcodecs/libmpencoders.a: $(wildcard libmpcodecs/*.[ch])
libavutil/libavutil.a: $(wildcard libavutil/*.[ch])
libavcodec/libavcodec.a: $(wildcard libavcodec/*.[ch] libavcodec/*/*.[chS])
libavformat/libavformat.a: $(wildcard libavformat/*.[ch])
-postproc/libswscale.a: $(wildcard postproc/*.[ch])
+libswscale/libswscale.a: $(wildcard libswscale/*.[ch])
libmpeg2/libmpeg2.a: $(wildcard libmpeg2/*.[ch])
liba52/liba52.a: $(wildcard liba52/*.[ch])