diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-25 13:15:49 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-25 13:15:49 +0000 |
commit | 6f690e732fe6aefc5f4f54bfa235067af551ede5 (patch) | |
tree | db6c699da912643cdc9286b015713054a9953994 | |
parent | 60bebad4d290323f885d31381eacb73051a3ccdf (diff) | |
download | mpv-6f690e732fe6aefc5f4f54bfa235067af551ede5.tar.bz2 mpv-6f690e732fe6aefc5f4f54bfa235067af551ede5.tar.xz |
cosmetics: Move some parts to more sensible places.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19529 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Makefile | 49 |
1 files changed, 25 insertions, 24 deletions
@@ -14,6 +14,10 @@ ifeq ($(CONFIG_LIBAVCODEC),yes) LIBAV_INC += -I./libavcodec endif +CFLAGS = $(OPTFLAGS) -I. $(LIBAV_INC) + +#CFLAGS += -Wall + # Do not strip the binaries at installation ifeq ($(STRIPBINARIES),yes) INSTALLSTRIP = -s @@ -35,6 +39,10 @@ SRCS_COMMON = asxparser.c \ subreader.c \ vobsub.c \ +ifeq ($(UNRARLIB),yes) +SRCS_COMMON += unrarlib.c +endif + SRCS_MENCODER = mencoder.c \ mp_msg-mencoder.c \ $(SRCS_COMMON) \ @@ -44,6 +52,10 @@ SRCS_MENCODER = mencoder.c \ parser-mecmd.c \ xvid_vbr.c \ +ifeq ($(BITMAP_FONT),yes) +SRCS_MENCODER += libvo/font_load.c +endif + SRCS_MPLAYER = mplayer.c \ m_property.c \ mp_msg.c \ @@ -52,10 +64,6 @@ SRCS_MPLAYER = mplayer.c \ parser-mpcmd.c \ subopt-helper.c \ -ifeq ($(UNRARLIB),yes) -SRCS_COMMON += unrarlib.c -endif - OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) @@ -103,6 +111,19 @@ CODEC_LIBS = $(AV_LIB) \ $(MUSEPACK_LIB) \ $(SPEEX_LIB) \ +ifeq ($(TOOLAME),yes) +CFLAGS += $(TOOLAME_EXTRAFLAGS) +CODEC_LIBS += $(TOOLAME_LIB) +endif + +ifeq ($(TWOLAME),yes) +CODEC_LIBS += $(TWOLAME_LIB) +endif + +ifeq ($(FAAC),yes) +CODEC_LIBS += $(FAAC_LIB) +endif + COMMON_LIBS = libmpcodecs/libmpcodecs.a \ $(W32_LIB) \ libaf/libaf.a \ @@ -130,23 +151,6 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \ $(MATH_LIB) \ $(LIBC_LIB) \ -CFLAGS = $(OPTFLAGS) -I. $(LIBAV_INC) - -#CFLAGS += -Wall - -ifeq ($(TOOLAME),yes) -CFLAGS += $(TOOLAME_EXTRAFLAGS) -CODEC_LIBS += $(TOOLAME_LIB) -endif - -ifeq ($(TWOLAME),yes) -CODEC_LIBS += $(TWOLAME_LIB) -endif - -ifeq ($(FAAC),yes) -CODEC_LIBS += $(FAAC_LIB) -endif - PARTS = libmpdemux \ stream \ libmpcodecs \ @@ -246,9 +250,6 @@ COMMON_DEPS += libass/libass.a COMMON_LIBS += libass/libass.a PARTS += libass endif -ifeq ($(BITMAP_FONT),yes) -SRCS_MENCODER += libvo/font_load.c -endif # FontConfig and FreeType need to come after ASS to avoid link failures on MinGW COMMON_LIBS += $(FONTCONFIG_LIB) ifeq ($(FREETYPE),yes) |