Commit 3b9f212d authored by Rafaël Carré's avatar Rafaël Carré

caca doesn't use x11 on OSX

parent 995c31f1
...@@ -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)
......
...@@ -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>
#ifndef 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
......
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