From c4f68de1456ddb561f322b84e2ba1b790eec4c28 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 13 Aug 2012 12:08:22 +0200 Subject: TOOLS: add script for osx bundle generation Add a make task and python script to create a Mac OS X Application Bundle to be used when compiling with the --enable-macosx-finder and --enable-macosx-bundle configure flags. The main svg icon was created by me and heavily inspired by Apple's iTunes and AppStore icon designs. We are still looking for something better. For the audio, movie and subtitles icons I added the main logo to MPlayer OSX Extended icons. Use with `make osxbundle` after running configure and make. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c6dc0f6090..271c3f5624 100644 --- a/Makefile +++ b/Makefile @@ -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* -- cgit v1.2.3 From dfcfe058850b07ae9077eea8415cf5315deb1937 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 20 Oct 2012 16:45:05 +0200 Subject: build: fix compilation on Windows (manifest files) --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 271c3f5624..7224062436 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 ####### -- cgit v1.2.3