Skip to content

V
vlc
Commit 1b4b6c0c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Win32: use winmm only on Win32-desktop

parent 63db4432
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
configure.ac
View file @ 1b4b6c0c
...@@ -258,7 +258,6 @@ case "${host_os}" in ...@@ -258,7 +258,6 @@ case "${host_os}" in
# DEP, ASLR, NO SEH # DEP, ASLR, NO SEH
LDFLAGS="${LDFLAGS} -Wl,--nxcompat -Wl,--no-seh -Wl,--dynamicbase" LDFLAGS="${LDFLAGS} -Wl,--nxcompat -Wl,--no-seh -Wl,--dynamicbase"
VLC_ADD_LIBS([libvlccore],[-lwinmm])
VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([win32text],[-lgdi32]) VLC_ADD_LIBS([win32text],[-lgdi32])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
...@@ -511,6 +510,8 @@ vlc_winstore_app=0 ...@@ -511,6 +510,8 @@ vlc_winstore_app=0
AS_IF([test "${SYS}" = "mingw32" -a "${enable_winstore_app}" = "yes"], [ AS_IF([test "${SYS}" = "mingw32" -a "${enable_winstore_app}" = "yes"], [
vlc_winstore_app=1 vlc_winstore_app=1
VLC_ADD_LIBS([libvlccore], [-lole32 -lruntimeobject]) VLC_ADD_LIBS([libvlccore], [-lole32 -lruntimeobject])
],[
VLC_ADD_LIBS([libvlccore],[-lwinmm])
]) ])
AC_DEFINE_UNQUOTED(VLC_WINSTORE_APP, ${vlc_winstore_app}, [Define to 1 if you want to build for Windows Store apps]) AC_DEFINE_UNQUOTED(VLC_WINSTORE_APP, ${vlc_winstore_app}, [Define to 1 if you want to build for Windows Store apps])
AM_CONDITIONAL([HAVE_WINSTORE], [test "$vlc_winstore_app" = "1"]) AM_CONDITIONAL([HAVE_WINSTORE], [test "$vlc_winstore_app" = "1"])
......
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