RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 00:02:13 +00:00
Code Issues Releases Wiki Activity

cosmetics: Move some parts around to make more sense overall.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22559 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-03-13 23:42:38 +00:00
parent 43cbd97f17
commit 1c47e97b9c
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Makefile
View File

@ -14,6 +14,15 @@ CFLAGS += $(CFLAGS-yes)
#CFLAGS += -Wall
COMMON_LDFLAGS += $(EXTRA_LIB)\
$(EXTRALIBS) \
LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \
$(COMMON_LDFLAGS) \
LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \
$(COMMON_LDFLAGS) \
SRCS_COMMON = asxparser.c \
codec-cfg.c \
cpudetect.c \
@ -60,16 +69,6 @@ LIBS_MPLAYER = libvo/libvo.a \
LIBS_MENCODER = libmpcodecs/libmpencoders.a \
libmpdemux/libmpmux.a \
OBJS_COMMON = $(SRCS_COMMON:.c=.o)
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
# Having this in libosdep.a is not enough.
OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS)
MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS)
PARTS = libmpdemux \
stream \
libmpcodecs \
@ -117,15 +116,6 @@ PARTS-$(GUI) += Gui
LIBS_MPLAYER-$(LIBMENU) += libmenu/libmenu.a
PARTS-$(LIBMENU) += libmenu
COMMON_LDFLAGS += $(EXTRA_LIB)\
$(EXTRALIBS) \
LDFLAGS_MPLAYER = $(EXTRALIBS_MPLAYER) \
$(COMMON_LDFLAGS) \
LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \
$(COMMON_LDFLAGS) \
ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
@ -136,8 +126,18 @@ OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
PARTS += $(PARTS-yes)
ALL_PRG += $(ALL_PRG-yes)
OBJS_COMMON = $(SRCS_COMMON:.c=.o)
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
# Having this in libosdep.a is not enough.
OBJS_MPLAYER-$(TARGET_WIN32) += osdep/mplayer-rc.o
COMMON_LIBS += osdep/libosdep.a
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS)
MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS)
all: $(ALL_PRG)