Commit 8dc4f35a authored by Clément Stenac's avatar Clément Stenac

Fixes for prehistoric build system

parent 1ce36146
......@@ -878,6 +878,9 @@ package-win32-base:
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
......@@ -891,6 +894,16 @@ package-win32-base:
cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ;
cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
......@@ -985,6 +998,9 @@ package-wince-base:
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
......@@ -998,6 +1014,16 @@ package-wince-base:
cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ;
cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
if BUILD_MOZILLA
......
......@@ -107,9 +107,7 @@ void FileInfo::Update()
FIND_ANYWHERE );
if( !p_playlist ) return;
input_thread_t *p_input =
(input_thread_t *)vlc_object_find( p_playlist, VLC_OBJECT_INPUT,
FIND_CHILD );
input_thread_t *p_input = p_playlist->p_input ;
if( !p_input || p_input->b_dead || !p_input->input.p_item->psz_name )
{
......
......@@ -15,7 +15,6 @@ dist_pkgdata_DATA = \
nobase_dist_pkgdata_DATA = \
$(DIST_skins2) \
$(DIST_http) \
$(DIST_http_old) \
$(DIST_osdmenu_default) \
$(DIST_osdmenu_dvd) \
$(NULL)
......@@ -120,24 +119,22 @@ DIST_http = \
http/images/help.png \
http/images/playlist_small.png \
http/mosaic.html \
$(NULL)
DIST_http_old = \
http-old/index.html \
http-old/info.html \
http-old/.hosts \
http-old/admin/index.html \
http-old/admin/browse.html \
http-old/admin/dboxfiles.html \
http-old/admin/.access \
http-old/vlm/edit.html \
http-old/vlm/index.html \
http-old/vlm/new.html \
http-old/style.css \
http-old/webcam.html \
http-old/favicon.ico \
http-old/cone_minus.png \
http-old/cone_plus.png \
http/old/index.html \
http/old/.hosts \
http/old/info.html \
http/old/webcam.html \
http/old/style.css \
http/old/cone_plus.png \
http/old/cone_minus.png \
http/old/favicon.ico \
http/old/admin/browse.html \
http/old/admin/dboxfiles.html \
http/old/admin/index.html \
http/old/admin/.access \
http/old/vlm/edit.html \
http/old/vlm/index.html \
http/old/vlm/new.html \
http/old/vlm/show.html \
$(NULL)
DIST_osdmenu_default = \
......
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