From a743c0a73824f1f3bce5b59ef6d57e871d3f5022 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 18 Mar 2010 20:44:01 +0000 Subject: Split codec path related code into a separate file to fix Windows build. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30930 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b698bf6289..72f8dcd524 100644 --- a/Makefile +++ b/Makefile @@ -315,6 +315,7 @@ SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/vd_vfwex.c \ libmpdemux/demux_avs.c \ loader/afl.c \ + loader/codecpath.c \ loader/drv.c \ loader/vfl.c \ loader/dshow/DS_AudioDecoder.c \ -- cgit v1.2.3 From a06a3d476d268f9e17769916ebabf684af95e5e4 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 20 Mar 2010 23:27:07 +0000 Subject: Move SetCodecPath() from loader to get_path.c and make it unconditional. This fixes compilation with the Win32 loader disabled but other binary codec loaders enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30942 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 72f8dcd524..b698bf6289 100644 --- a/Makefile +++ b/Makefile @@ -315,7 +315,6 @@ SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/vd_vfwex.c \ libmpdemux/demux_avs.c \ loader/afl.c \ - loader/codecpath.c \ loader/drv.c \ loader/vfl.c \ loader/dshow/DS_AudioDecoder.c \ -- cgit v1.2.3 From 70c66c04764421ca277c341657c556cb0f00ec9b Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 20 Mar 2010 23:38:27 +0000 Subject: Rename get_path.[ch] --> path.[ch]. These files now contain different functions related to path handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b698bf6289..4773345028 100644 --- a/Makefile +++ b/Makefile @@ -344,12 +344,12 @@ SRCS_COMMON = asxparser.c \ edl.c \ find_sub.c \ fmt-conversion.c \ - get_path.c \ m_config.c \ m_option.c \ m_struct.c \ mpcommon.c \ parser-cfg.c \ + path.c \ playtree.c \ playtreeparser.c \ spudec.c \ -- cgit v1.2.3 From 85640449d2fb159da89473a8b4958ff7082fd88d Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 26 Mar 2010 12:12:25 +0000 Subject: cosmetics: Break some overly long lines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30963 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4773345028..0f0d64c519 100644 --- a/Makefile +++ b/Makefile @@ -556,7 +556,8 @@ SRCS_MPLAYER-$(ESD) += libao2/ao_esd.c SRCS_MPLAYER-$(FBDEV) += libvo/vo_fbdev.c libvo/vo_fbdev2.c SRCS_MPLAYER-$(GGI) += libvo/vo_ggi.c SRCS_MPLAYER-$(GIF) += libvo/vo_gif89a.c -SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c libvo/vo_gl2.c libvo/csputils.c +SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c \ + libvo/vo_gl2.c libvo/csputils.c SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c SRCS_MPLAYER-$(GL_X11) += libvo/x11_common.c SRCS_MPLAYER-$(MATRIXVIEW) += libvo/vo_matrixview.c libvo/matrixview.c @@ -663,7 +664,8 @@ SRCS_MPLAYER-$(VIDIX_UNICHROME) += vidix/unichrome_vid.c SRCS_MPLAYER-$(WII) += libvo/vo_wii.c SRCS_MPLAYER-$(WIN32WAVEOUT) += libao2/ao_win32.c SRCS_MPLAYER-$(WINVIDIX) += libvo/vo_winvidix.c -SRCS_MPLAYER-$(X11) += libvo/vo_x11.c libvo/vo_xover.c libvo/x11_common.c +SRCS_MPLAYER-$(X11) += libvo/vo_x11.c libvo/vo_xover.c \ + libvo/x11_common.c SRCS_MPLAYER-$(XMGA) += libvo/vo_xmga.c SRCS_MPLAYER-$(XV) += libvo/vo_xv.c SRCS_MPLAYER-$(XVIDIX) += libvo/vo_xvidix.c @@ -697,7 +699,8 @@ SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c SRCS_MENCODER-$(LIBAVFORMAT) += libmpdemux/muxer_lavf.c SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c -SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c libmpcodecs/native/rtjpegn.c +SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \ + libmpcodecs/native/rtjpegn.c SRCS_MENCODER-$(MP3LAME) += libmpcodecs/ae_lame.c SRCS_MENCODER-$(QTX_CODECS_WIN32) += libmpcodecs/ve_qtvideo.c SRCS_MENCODER-$(TOOLAME) += libmpcodecs/ae_toolame.c -- cgit v1.2.3