vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Fri Nov 21 13:10:11 2014 +0100| [1b4b6c0cd28335613d3f59210eaf5748eeff3aa6] | committer: Jean-Baptiste Kempf
Win32: use winmm only on Win32-desktop > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1b4b6c0cd28335613d3f59210eaf5748eeff3aa6 --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1fed874..2cabc31 100644 --- a/configure.ac +++ b/configure.ac @@ -258,7 +258,6 @@ case "${host_os}" in # DEP, ASLR, NO SEH LDFLAGS="${LDFLAGS} -Wl,--nxcompat -Wl,--no-seh -Wl,--dynamicbase" - VLC_ADD_LIBS([libvlccore],[-lwinmm]) VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([win32text],[-lgdi32]) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) @@ -510,7 +509,9 @@ AC_ARG_ENABLE(winstore_app, vlc_winstore_app=0 AS_IF([test "${SYS}" = "mingw32" -a "${enable_winstore_app}" = "yes"], [ 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]) AM_CONDITIONAL([HAVE_WINSTORE], [test "$vlc_winstore_app" = "1"]) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
