Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
3b9f212d
Commit
3b9f212d
authored
May 17, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caca doesn't use x11 on OSX
parent
995c31f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
modules/video_output/Modules.am
modules/video_output/Modules.am
+2
-0
modules/video_output/caca.c
modules/video_output/caca.c
+1
-1
No files found.
modules/video_output/Modules.am
View file @
3b9f212d
...
@@ -136,8 +136,10 @@ libcaca_plugin_la_SOURCES = caca.c
...
@@ -136,8 +136,10 @@ libcaca_plugin_la_SOURCES = caca.c
libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
libcaca_plugin_la_LIBADD = $(AM_LIBADD) $(CACA_LIBS)
libcaca_plugin_la_LIBADD = $(AM_LIBADD) $(CACA_LIBS)
if !HAVE_WIN32
if !HAVE_WIN32
if !HAVE_DARWIN
libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
endif
endif
endif
libcaca_plugin_la_DEPENDENCIES =
libcaca_plugin_la_DEPENDENCIES =
EXTRA_LTLIBRARIES += libcaca_plugin.la
EXTRA_LTLIBRARIES += libcaca_plugin.la
libvlc_LTLIBRARIES += $(LTLIBcaca)
libvlc_LTLIBRARIES += $(LTLIBcaca)
...
...
modules/video_output/caca.c
View file @
3b9f212d
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
#include <vlc_plugin.h>
#include <vlc_plugin.h>
#include <vlc_vout_display.h>
#include <vlc_vout_display.h>
#include <vlc_picture_pool.h>
#include <vlc_picture_pool.h>
#if
ndef WIN32
#if
!defined(WIN32) && !defined(__APPLE__)
# ifdef X_DISPLAY_MISSING
# ifdef X_DISPLAY_MISSING
# error Xlib required due to XInitThreads
# error Xlib required due to XInitThreads
# endif
# endif
...
...
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