diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | libmpcodecs/Makefile | 7 | ||||
| -rw-r--r-- | libmpcodecs/ad_msgsm.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/ad_roqaudio.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/native/xa_gsm.c (renamed from xa/xa_gsm.c) | 0 | ||||
| -rw-r--r-- | libmpcodecs/native/xa_gsm.h (renamed from xa/xa_gsm.h) | 0 | ||||
| -rw-r--r-- | libmpcodecs/native/xa_gsm_int.h (renamed from xa/xa_gsm_int.h) | 0 |
7 files changed, 10 insertions, 12 deletions
@@ -37,7 +37,7 @@ MANDIR = ${prefix}/man # a BSD compatible 'install' program INSTALL = install -SRCS_COMMON = cyuv.c xacodec.c cpudetect.c mp_msg.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c roqav.c qtrpza.c vobsub.c +SRCS_COMMON = xacodec.c cpudetect.c mp_msg.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c me-opt-reg.c SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c mp-opt-reg.c @@ -56,14 +56,14 @@ V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA AO_LIBS = -Llibao2 -lao2 A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB) -CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lmp3lib -lMP3 -Lliba52 -la52 -Lxa -lxa -Llibmpeg2 -lmpeg2 $(AV_LIB) -Llibfame -lfame +CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lmp3lib -lMP3 -Lliba52 -la52 -Llibmpeg2 -lmpeg2 $(AV_LIB) -Llibfame -lfame COMMON_LIBS = $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(NEW_INPUT_LIB) $(LIB_LOADER) $(A_LIBS) $(CSS_LIB) $(ARCH_LIB) -Lpostproc -lpostproc $(DECORE_LIB) -Llinux -losdep $(TERMCAP_LIB) $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) -lm ifeq ($(VIDIX),yes) MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix endif CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) # -Wall -PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers drivers/syncfb linux postproc xa input +PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers drivers/syncfb linux postproc input ifeq ($(VIDIX),yes) PARTS += libdha vidix endif @@ -105,7 +105,7 @@ all: $(ALL_PRG) .c.o: $(CC) -c $(CFLAGS) -o $@ $< -COMMON_DEPS = libfame/libfame.a libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a input/libinput.a +COMMON_DEPS = libfame/libfame.a libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a ifeq ($(VIDIX),yes) COMMON_DEPS += libdha/libdha.so vidix/libvidix.a @@ -173,9 +173,6 @@ linux/libosdep.a: postproc/libpostproc.a: $(MAKE) -C postproc -xa/libxa.a: - $(MAKE) -C xa - input/libinput.a: $(MAKE) -C input diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index f90d12c257..5fdffb5890 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -8,6 +8,7 @@ AUDIO_SRCS=dec_audio.c ad.c ad_a52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dk4adpc VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_zlib.c vd_mpegpes.c VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_fame.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c +NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c ifeq ($(PNG),yes) VIDEO_SRCS += vd_mpng.c @@ -17,13 +18,13 @@ ifeq ($(JPEG),yes) VIDEO_SRCS += vd_ijpg.c endif -SRCS=$(AUDIO_SRCS) $(VIDEO_SRCS) $(VFILTER_SRCS) +SRCS=$(AUDIO_SRCS) $(VIDEO_SRCS) $(VFILTER_SRCS) $(NATIVE_SRCS) OBJS=$(SRCS:.c=.o) SRCS2=$(ENCODER_SRCS) OBJS2=$(SRCS2:.c=.o) -CFLAGS = -Wall $(OPTFLAGS) -I. -I.. -I../libmpdemux -I../loader $(EXTRA_INC) +CFLAGS = -Wall $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) .SUFFIXES: .c .o @@ -44,7 +45,7 @@ clean: rm -f *.o *.a *~ distclean: - rm -f Makefile.bak *.o *.a *~ .depend + rm -f Makefile.bak $(OBJS) $(OBJS2) $(LIBNAME) $(LIBNAME2) *~ .depend dep: depend diff --git a/libmpcodecs/ad_msgsm.c b/libmpcodecs/ad_msgsm.c index a45cfd402b..0aabe0aaba 100644 --- a/libmpcodecs/ad_msgsm.c +++ b/libmpcodecs/ad_msgsm.c @@ -17,7 +17,7 @@ static ad_info_t info = LIBAD_EXTERN(msgsm) -#include "xa/xa_gsm.h" +#include "xa_gsm.h" static int init(sh_audio_t *sh_audio) { diff --git a/libmpcodecs/ad_roqaudio.c b/libmpcodecs/ad_roqaudio.c index 8d30d63b83..556a8bdcf5 100644 --- a/libmpcodecs/ad_roqaudio.c +++ b/libmpcodecs/ad_roqaudio.c @@ -4,7 +4,7 @@ #include "config.h" #include "ad_internal.h" -#include "../roqav.h" +#include "roqav.h" static ad_info_t info = { diff --git a/xa/xa_gsm.c b/libmpcodecs/native/xa_gsm.c index d014eaabbc..d014eaabbc 100644 --- a/xa/xa_gsm.c +++ b/libmpcodecs/native/xa_gsm.c diff --git a/xa/xa_gsm.h b/libmpcodecs/native/xa_gsm.h index 212fbe0e97..212fbe0e97 100644 --- a/xa/xa_gsm.h +++ b/libmpcodecs/native/xa_gsm.h diff --git a/xa/xa_gsm_int.h b/libmpcodecs/native/xa_gsm_int.h index 3bc0f051fc..3bc0f051fc 100644 --- a/xa/xa_gsm_int.h +++ b/libmpcodecs/native/xa_gsm_int.h |