VideoPlayer: squash win

popcornmix · Sep 21, 2015 · 61f55da · 61f55da
1 parent c3f8b08
commit 61f55da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/project/Win32BuildSetup/buildffmpeg.sh b/project/Win32BuildSetup/buildffmpeg.sh
@@ -88,7 +88,7 @@ OPTIONS="
 --enable-libdcadec"
 
 echo configuring $LIBNAME
-./configure --extra-cflags="-fno-common -I/xbmc/lib/win32/ffmpeg_dxva2 -DNDEBUG" --extra-ldflags="-L/xbmc/system/players/VideoPlayer" ${OPTIONS} &&
+./configure --extra-cflags="-fno-common -I/xbmc/lib/win32/ffmpeg_dxva2 -DNDEBUG" --extra-ldflags="-L/xbmc/system/players/VideoPlayer -L/xbmc/system/players/dvdplayer" ${OPTIONS} &&
 
 make $MAKEFLAGS &&
 cp lib*/*.dll .libs/ &&

diff --git a/xbmc/DllPaths_win32.h b/xbmc/DllPaths_win32.h
@@ -34,8 +34,8 @@
 
 /* VideoPlayer */
 #define DLL_PATH_LIBASS        "special://xbmcbin/system/players/dvdplayer/libass.dll"
-#define DLL_PATH_LIBMPEG2      "special://xbmcbin/system/players/dvdplayer/libmpeg2-0.dll"
-#define DLL_PATH_LIBDVDNAV     "special://xbmcbin/system/players/dvdplayer/libdvdnav.dll"
+#define DLL_PATH_LIBMPEG2      "special://xbmcbin/system/players/VideoPlayer/libmpeg2-0.dll"
+#define DLL_PATH_LIBDVDNAV     "special://xbmcbin/system/players/VideoPlayer/libdvdnav.dll"
 #define DLL_PATH_LIBRTMP       "special://xbmcbin/system/players/dvdplayer/librtmp.dll"
 
 /* libbluray */