Commit a3a3ebbe authored by David's avatar David
Browse files

macosx: Remove Makefile recursion, change xib compilation

xib compilation is changed to be not triggered if macosx module
is not built.
parent 3fe69299
...@@ -3822,8 +3822,6 @@ then ...@@ -3822,8 +3822,6 @@ then
AC_MSG_ERROR([ibtool was not found, but is required for --enable-macosx]) AC_MSG_ERROR([ibtool was not found, but is required for --enable-macosx])
]) ])
]) ])
VLC_ADD_PLUGIN([macosx])
fi fi
AM_CONDITIONAL(ENABLE_MACOSX_UI, [test "$enable_macosx" != "no" -a "${SYS}" = "darwin"]) AM_CONDITIONAL(ENABLE_MACOSX_UI, [test "$enable_macosx" != "no" -a "${SYS}" = "darwin"])
...@@ -4231,7 +4229,6 @@ AC_CONFIG_FILES([ ...@@ -4231,7 +4229,6 @@ AC_CONFIG_FILES([
lib/Makefile lib/Makefile
bin/Makefile bin/Makefile
test/Makefile test/Makefile
modules/gui/macosx/Makefile
modules/hw/mmal/Makefile modules/hw/mmal/Makefile
share/vlc.appdata.xml.in share/vlc.appdata.xml.in
]) ])
......
...@@ -16,10 +16,8 @@ VLC.app: install ...@@ -16,10 +16,8 @@ VLC.app: install
rm -Rf $@ rm -Rf $@
## Copy Contents ## Copy Contents
cp -R $(prefix)/share/macosx/ $@ cp -R $(prefix)/share/macosx/ $@
## Copy .strings file ## Copy .strings file and .nib files
cp -R $(top_builddir)/modules/gui/macosx/UI/InfoPlist.strings $@/Contents/Resources/UI cp -R $(top_builddir)/modules/gui/macosx/UI $@/Contents/Resources/English.lproj
## Rename interface files (UI) folder
mv $@/Contents/Resources/UI $@/Contents/Resources/English.lproj
## Copy Info.plist and convert to binary ## Copy Info.plist and convert to binary
cp -R $(top_builddir)/share/macosx/Info.plist $@/Contents/ cp -R $(top_builddir)/share/macosx/Info.plist $@/Contents/
xcrun plutil -convert binary1 $@/Contents/Info.plist xcrun plutil -convert binary1 $@/Contents/Info.plist
......
guidir = $(pluginsdir)/gui guidir = $(pluginsdir)/gui
gui_LTLIBRARIES = gui_LTLIBRARIES =
DIST_SUBDIRS += gui/macosx
if ENABLE_MACOSX_UI
SUBDIRS += gui/macosx
endif
libncurses_plugin_la_SOURCES = gui/ncurses.c libncurses_plugin_la_SOURCES = gui/ncurses.c
libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS) libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM) libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBPTHREAD) $(LIBM)
...@@ -26,5 +20,6 @@ libminimal_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' -Wl,-fram ...@@ -26,5 +20,6 @@ libminimal_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' -Wl,-fram
EXTRA_LTLIBRARIES += libminimal_macosx_plugin.la EXTRA_LTLIBRARIES += libminimal_macosx_plugin.la
gui_LTLIBRARIES += $(LTLIBminimal_macosx) gui_LTLIBRARIES += $(LTLIBminimal_macosx)
include gui/macosx/Makefile.am
include gui/qt/Makefile.am include gui/qt/Makefile.am
include gui/skins2/Makefile.am include gui/skins2/Makefile.am
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment