Skip to content

V
vlc
Commit 0b321496 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

autoconf build fix 

one todo item less !
parent 3c98fc75
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
TODO
View file @ 0b321496
...@@ -477,8 +477,8 @@ Difficulty: Hard ...@@ -477,8 +477,8 @@ Difficulty: Hard
Urgency: Wishlist Urgency: Wishlist
Platform: Windows Platform: Windows
Description: ActiveX control for VLC Description: ActiveX control for VLC
We need an ActiveX version of VLC for IE intergration We need an ActiveX version of VLC for IE integration
Status: Todo Status: Done by damienf
Task Task
Difficulty: Easy Difficulty: Easy
......
configure.ac
View file @ 0b321496
...@@ -3919,6 +3919,7 @@ dnl ...@@ -3919,6 +3919,7 @@ dnl
dnl Microsoft ActiveX support dnl Microsoft ActiveX support
dnl dnl
AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)]) AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)])
AM_CONDITIONAL(HAS_MIDL_COMPILER, test -n "${MIDL}")
AC_ARG_ENABLE(activex, AC_ARG_ENABLE(activex,
[ --enable-activex build a vlc-based ActiveX control (default enabled on Win32)]) [ --enable-activex build a vlc-based ActiveX control (default enabled on Win32)])
if test "${enable_activex}" != "no" if test "${enable_activex}" != "no"
...@@ -3926,7 +3927,6 @@ then ...@@ -3926,7 +3927,6 @@ then
if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
then then
AC_CHECK_PROG(MIDL, midl, :) AC_CHECK_PROG(MIDL, midl, :)
AM_CONDITIONAL(HAS_MIDL_COMPILER, test -n "${MIDL}")
AC_CHECK_HEADERS(ole2.h olectl.h, AC_CHECK_HEADERS(ole2.h olectl.h,
[ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions]) [ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid]) VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid])
......
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