]> git.sesse.net Git - vlc/commitdiff
Temporary Hack to fix compile on Win32.
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 12 Aug 2008 01:15:55 +0000 (18:15 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 12 Aug 2008 01:18:16 +0000 (18:18 -0700)
configure.ac

index b9bc30e749c95426710ff811cddd1997c1db58c8..1691b3c63e3e2f41c51bc925961326f3127b5deb 100644 (file)
@@ -3779,9 +3779,12 @@ AS_IF( [test "${enable_libass}" = "yes"], [
         VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
         VLC_ADD_PLUGIN([libass])
 
-               AC_CHECK_HEADERS(fontconfig/fontconfig.h,
-                 [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
-                  VLC_ADD_LIBS([libass],[-lfontconfig])])
+        AC_CHECK_HEADERS(fontconfig/fontconfig.h,
+          [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
+           VLC_ADD_LIBS([libass],[-lfontconfig])])
+        if test "${SYS}" = "mingw32"; then
+          VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv  -lxml2])
+        fi
       ],[
         AC_MSG_WARN([LIBASS library not found])
       ])
@@ -4158,7 +4161,10 @@ then
       VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
       if test "${SYS}" = "mingw32"; then
         VLC_ADD_LIBS([freetype skins2],[-lxml2])
-     fi
+      fi
+      if test "${SYS}" = "mingw32"; then
+        VLC_ADD_LIBS([freetype],[-liconv])
+      fi
     AC_CHECK_HEADERS(fontconfig/fontconfig.h,
       [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
        VLC_ADD_LIBS([freetype],[-lfontconfig])])