]> git.sesse.net Git - vlc/commitdiff
Win32: use winmm only on Win32-desktop
authorJean-Baptiste Kempf <jb@videolan.org>
Fri, 21 Nov 2014 12:10:11 +0000 (13:10 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 21 Nov 2014 12:10:11 +0000 (13:10 +0100)
configure.ac

index 1fed87429d838af4ab88123ab15f9017f9dfeb1c..2cabc31aa43b7794fb9158ade7656e7138cc2a41 100644 (file)
@@ -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"])