mirror of
https://code.videolan.org/videolan/vlc
synced 2024-08-31 06:46:39 +02:00
Rework breakpad detection to enable it on windows as well
This commit is contained in:
parent
d1f958ee63
commit
34d52c7081
@ -41,6 +41,7 @@ vlc_osx_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/plugins/"
|
||||
if HAVE_BREAKPAD
|
||||
vlc_osx_LDFLAGS += -Wl,-framework,Breakpad
|
||||
vlc_osx_OBJCFLAGS = -F$(CONTRIB_DIR)/Frameworks
|
||||
vlc_osx_CPPFLAGS = -DHAVE_BREAKPAD
|
||||
endif
|
||||
vlc_osx_LDADD = ../lib/libvlc.la
|
||||
|
||||
@ -56,6 +57,7 @@ vlc_osx_static_LDADD = $(vlc_osx_LDADD)
|
||||
if HAVE_BREAKPAD
|
||||
vlc_osx_static_LDFLAGS += -Wl,-framework,Breakpad
|
||||
vlc_osx_static_OBJCFLAGS += -F$(CONTRIB_DIR)/Frameworks
|
||||
vlc_osx_static_CPPFLAGS = -DHAVE_BREAKPAD
|
||||
endif
|
||||
|
||||
|
||||
|
17
configure.ac
17
configure.ac
@ -3839,24 +3839,27 @@ AS_IF([test "$with_breakpad" != "no"], [
|
||||
AC_MSG_ERROR([You need to supply the CrashDragon Server URL as value for --with-breakpad])
|
||||
])
|
||||
|
||||
AS_IF([test "$HAVE_OSX" != "1"], [
|
||||
AC_MSG_ERROR([Breakpad currently only works on macOS])
|
||||
])
|
||||
|
||||
AS_IF([test "$HAVE_OSX" = "1"], [
|
||||
AC_MSG_CHECKING([for Breakpad framework])
|
||||
AS_IF([test ! -d ${CONTRIB_DIR}/Breakpad.framework -a \
|
||||
! -d ${CONTRIB_DIR}/Frameworks/Breakpad.framework], [
|
||||
AC_MSG_RESULT([no])
|
||||
with_breakpad="no"
|
||||
AC_MSG_ERROR([Breakpad framework is required and was not found in ${CONTRIB_DIR}])
|
||||
], [
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_DEFINE([HAVE_BREAKPAD], [1], [Define to 1 if breakpad is enabled.])
|
||||
AC_SUBST(BREAKPAD_URL, ["${with_breakpad}"])
|
||||
])
|
||||
|
||||
],[
|
||||
PKG_CHECK_MODULES([BREAKPAD], [breakpad-client],, [
|
||||
AC_MSG_ERROR(["breakpad not found"])
|
||||
])
|
||||
])
|
||||
])
|
||||
|
||||
AM_CONDITIONAL(HAVE_BREAKPAD, [test "$with_breakpad" != "no"])
|
||||
AS_IF([test "$with_breakpad" != "no"], [
|
||||
AC_SUBST(BREAKPAD_URL, ["${with_breakpad}"])
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl Minimal Mac OS X module
|
||||
|
Loading…
Reference in New Issue
Block a user