Commit 7676e68d authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

Fixed the compilation of multiple Mac OS X related modules

by using VLC_ADD_PLUGIN instead of VLC_ADD_BUILTINS.

Please check for potential regressions.
parent 4d2de3f7
...@@ -4888,7 +4888,7 @@ if test "${enable_macosx-audio}" != "no" && ...@@ -4888,7 +4888,7 @@ if test "${enable_macosx-audio}" != "no" &&
(test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes") (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes")
then then
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
[ VLC_ADD_BUILTINS([auhal]) [ VLC_ADD_PLUGIN([auhal])
VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon])
], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
fi fi
...@@ -5493,7 +5493,8 @@ then ...@@ -5493,7 +5493,8 @@ then
VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] ) VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] )
# VLC_ADD_PLUGIN([access_eyetv]) # VLC_ADD_PLUGIN([access_eyetv])
VLC_ADD_BUILTINS([macosx minimal_macosx]) VLC_ADD_PLUGIN([macosx])
VLC_ADD_PLUGIN([minimal_macosx])
ORIGCFLAGS=$CFLAGS ORIGCFLAGS=$CFLAGS
CFLAGS="$CFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c"
...@@ -5638,7 +5639,7 @@ then ...@@ -5638,7 +5639,7 @@ then
fi fi
if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then
AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a) AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a)
VLC_ADD_BUILTINS([goom]) VLC_ADD_PLUGIN([goom])
VLC_ADD_LIBS([goom],[-L${real_goom_tree}/src/.libs -lgoom2]) VLC_ADD_LIBS([goom],[-L${real_goom_tree}/src/.libs -lgoom2])
VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE]) VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE])
else else
...@@ -5647,7 +5648,7 @@ then ...@@ -5647,7 +5648,7 @@ then
AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
if test -f "${real_goom_tree}/libgoom.a"; then if test -f "${real_goom_tree}/libgoom.a"; then
AC_MSG_RESULT(${real_goom_tree}/libgoom.a) AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
VLC_ADD_BUILTINS([goom]) VLC_ADD_PLUGIN([goom])
VLC_ADD_LIBS([goom],[-L${real_goom_tree} -lgoom]) VLC_ADD_LIBS([goom],[-L${real_goom_tree} -lgoom])
VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM]) VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM])
else else
......
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