Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
d33d0f04
Commit
d33d0f04
authored
Jun 24, 2015
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minimal_macosx: Remove Modules.am
parent
abde9b5b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
22 deletions
+12
-22
configure.ac
configure.ac
+0
-4
modules/gui/Makefile.am
modules/gui/Makefile.am
+12
-4
modules/gui/minimal_macosx/.gitignore
modules/gui/minimal_macosx/.gitignore
+0
-1
modules/gui/minimal_macosx/Modules.am
modules/gui/minimal_macosx/Modules.am
+0
-13
No files found.
configure.ac
View file @
d33d0f04
...
...
@@ -3817,11 +3817,8 @@ AC_ARG_ENABLE(minimal-macosx,
[ --enable-minimal-macosx Minimal Mac OS X support (default disabled)])
if test "${enable_minimal_macosx}" = "yes" -a "${SYS}" = "darwin"
then
VLC_ADD_LIBS([minimal_macosx], [-Wl,-framework,Cocoa])
VLC_ADD_OBJCFLAGS([minimal_macosx], [-fobjc-exceptions] )
VLC_ADD_PLUGIN([minimal_macosx])
fi
AM_CONDITIONAL(ENABLE_MINIMAL_MACOSX, [test "$enable_minimal_macosx" != "no"])
dnl
dnl MacOS X dialog provider
...
...
@@ -4155,7 +4152,6 @@ AC_CONFIG_FILES([
test/Makefile
modules/gui/ios_dialog_provider/Makefile
modules/gui/macosx/Makefile
modules/gui/minimal_macosx/Makefile
modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
modules/hw/mmal/Makefile
...
...
modules/gui/Makefile.am
View file @
d33d0f04
guidir
=
$(pluginsdir)
/gui
gui_LTLIBRARIES
=
DIST_SUBDIRS
+=
gui/macosx gui/
minimal_macosx gui/
qt4 gui/skins2 gui/ios_dialog_provider
DIST_SUBDIRS
+=
gui/macosx gui/qt4 gui/skins2 gui/ios_dialog_provider
if
ENABLE_MACOSX_UI
SUBDIRS
+=
gui/macosx
...
...
@@ -9,9 +9,6 @@ endif
if
HAVE_IOS
SUBDIRS
+=
gui/ios_dialog_provider
endif
if
ENABLE_MINIMAL_MACOSX
SUBDIRS
+=
gui/minimal_macosx
endif
if
ENABLE_QT4
SUBDIRS
+=
gui/qt4
endif
...
...
@@ -38,3 +35,14 @@ libmacosx_dialog_provider_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' -
EXTRA_LTLIBRARIES
+=
libmacosx_dialog_provider_plugin.la
gui_LTLIBRARIES
+=
$(LTLIBmacosx_dialog_provider)
libminimal_macosx_plugin_la_SOURCES
=
\
gui/minimal_macosx/intf.h gui/minimal_macosx/intf.m
\
gui/minimal_macosx/misc.h gui/minimal_macosx/misc.m
\
gui/minimal_macosx/VLCMinimalVoutWindow.h gui/minimal_macosx/VLCMinimalVoutWindow.m
\
gui/minimal_macosx/macosx.c
libminimal_macosx_plugin_la_OBJCFLAGS
=
$(AM_OBJCFLAGS)
-fobjc-exceptions
libminimal_macosx_plugin_la_LDFLAGS
=
$(AM_LDFLAGS)
-rpath
'
$(guidir)
'
-Wl
,-framework,Cocoa
EXTRA_LTLIBRARIES
+=
libminimal_macosx_plugin.la
gui_LTLIBRARIES
+=
$(LTLIBminimal_macosx)
modules/gui/minimal_macosx/.gitignore
deleted
100644 → 0
View file @
abde9b5b
Makefile.am
modules/gui/minimal_macosx/Modules.am
deleted
100644 → 0
View file @
abde9b5b
AM_LIBTOOLFLAGS=--tag=CC
SOURCES_minimal_macosx = \
misc.m \
intf.m \
macosx.c \
VLCMinimalVoutWindow.m \
$(NULL)
noinst_HEADERS = \
intf.h \
misc.h \
VLCMinimalVoutWindow.h
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment