summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-24 22:38:45 +0200
committerwm4 <wm4@nowhere>2012-10-24 22:38:45 +0200
commit0e81d62c53a205ce5a4a5b201c283a1f9aba7316 (patch)
tree9ce8f4b0444a765c6a5dce3cb84c528a0e4ca3df /Makefile
parentbcf447d7e82af814ccc07c852543be38e58d69c8 (diff)
parent60cbc9461b86b13c68cc9537bc9a124ddc07a399 (diff)
downloadmpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.bz2
mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.xz
Merge branch 'master' into osd_changes
Conflicts: libvo/vo_xv.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7e566f06de..ffa73a8781 100644
--- a/Makefile
+++ b/Makefile
@@ -278,7 +278,7 @@ COMMON_LIBS += $(COMMON_LIBS-yes)
OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)))
OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)))
-OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
+OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mpv-rc.o
OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
@@ -406,9 +406,9 @@ checkheaders: $(ALLHEADERS:.h=.ho)
###### dependency declarations / specific CFLAGS ######
-version.c osdep/mplayer-rc.o: version.h
+version.c osdep/mpv-rc.o: version.h
-osdep/mplayer-rc.o: osdep/mplayer.exe.manifest
+osdep/mpv-rc.o: osdep/mpv.exe.manifest
###### installation / clean / generic rules #######
@@ -481,6 +481,9 @@ TAGS:
tags:
$(RM) $@; find . -name '*.[chS]' -o -name '*.asm' | xargs ctags -a
+osxbundle:
+ @TOOLS/osxbundle.py mpv
+
-include $(DEP_FILES)
.PHONY: all locales *install*