X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=dab015ae2f9e2010f66d62e61b425b7c2fb04dd1;hb=beaa856a8f906d6213fae2d0af7c21046e81cde2;hp=45d08056e44b5df6d68906d72ade02743827c792;hpb=719db51ce408331366a835a5245da84d07632d72;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 45d08056e4..dab015ae2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@ DIST_SUBDIRS = $(SUBDIRS) debian ipkg lib
 EXTRA_DIST = \
 	HACKING \
 	INSTALL.win32 \
+	INSTALL.wince \
 	vlc.exe.manifest \
 	MAINTAINERS \
 	README.MacOSX.rtf \
@@ -86,7 +87,6 @@ HEADERS_include = \
 	include/modules_inner.h \
 	include/mtime.h \
 	include/network.h \
-	include/osd.h \
 	include/os_specific.h \
 	include/snapshot.h \
 	include/stream_output.h \
@@ -430,6 +430,8 @@ SOURCES_libvlc_common = \
 	src/stream_output/acl.c \
 	src/osd/osd.c \
 	src/osd/osd_parser.c \
+	src/osd/osd_text.c \
+	src/osd/osd_widgets.c \
 	src/misc/charset.c \
 	src/misc/httpd.c \
 	src/misc/tls.c \
@@ -854,52 +856,21 @@ package-win32-base:
 	done
 
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd"
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected"
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect"
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection"
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume"
-	for i in $(srcdir)/share/osdmenu/*.*; do \
-	  cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/ || true ; \
-	  unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/`basename $$i` ; \
-	done
-	for i in $(srcdir)/share/osdmenu/dvd/*.*; do \
-	  cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd || true ; \
-	done
-	for i in $(srcdir)/share/osdmenu/dvd/unselect/*.*; do \
-	  cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect || true ; \
-	done
-	for i in $(srcdir)/share/osdmenu/dvd/selected/*.*; do \
-	  cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected/ || true ; \
-	done
-	for i in $(srcdir)/share/osdmenu/dvd/selection/*.*; do \
-	  cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection/ || true ; \
-	done
-	for i in $(srcdir)/share/osdmenu/dvd/volume/*.*; do \
-	  cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume/ || true ; \
-	done
-
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default"
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selected"
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selection"
-	mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/volume"
-	for i in $(srcdir)/share/osdmenu/default/*.*; do \
-	  cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default || true ; \
-	done
-	for i in $(srcdir)/share/osdmenu/default/selected/*.*; do \
-	  cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selected/ || true ; \
-	done
-	for i in $(srcdir)/share/osdmenu/default/selection/*.*; do \
-	  cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selection/ || true ; \
-	done
-	for i in $(srcdir)/share/osdmenu/default/volume/*.*; do \
-	  cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/volume/ || true ; \
+	cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
+	for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \
+		mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \
+		for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
+			 cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \
+		done; \
 	done
+	unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
+	sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
+	sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
 
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
 	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
 	cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
-	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;:
 	cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
 	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
 	cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
@@ -973,6 +944,85 @@ package-win32: package-win32-base package-win32-base-exe package-win32-base-zip
 # Clean up
 	rm -Rf $(top_builddir)/vlc-${VERSION}
 
+package-wince-base:
+# Check that tmp isn't in the way
+	@if test -e "$(top_builddir)/vlc-${VERSION}"; then \
+	  echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \
+	  false; \
+	else \
+	  echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \
+	fi
+
+# Copy relevant files
+	cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
+	cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
+	$(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
+
+	for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
+	  do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
+	  unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
+
+	mkdir $(top_builddir)/vlc-${VERSION}/locale
+	for i in $(ALL_LINGUAS); do \
+	  mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
+	  cp "$(srcdir)/po/$${i}.gmo" \
+	    "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
+            || true ; \
+	done
+
+
+	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
+	mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
+	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/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
+	cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
+	cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
+	cp $(srcdir)/share/http/admin/*.html \
+           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ;
+	cp $(srcdir)/share/http/admin/dboxfiles.html \
+           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
+	cp $(srcdir)/share/http/admin/.access \
+           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ;
+	cp $(srcdir)/share/http/vlm/*.html \
+           $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
+
+	cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
+
+if BUILD_MOZILLA
+	mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
+	cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
+	$(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+	cp $(top_builddir)/mozilla/vlcintf.xpt  $(top_builddir)/vlc-${VERSION}/mozilla/ ;
+endif
+
+if BUILD_ACTIVEX
+	mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
+	cp $(srcdir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
+	cp $(srcdir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
+	unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
+
+	cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
+	$(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
+endif
+# Rebase all those DLLs to speed up loading (need cygwin rebase)
+	if [ -x rebase ]; then \
+		find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
+	fi
+
+package-wince-base-zip:
+# Create package 
+	zip -r vlc-${VERSION}-wince.zip vlc-${VERSION}
+
+package-wince: package-wince-base  package-wince-base-zip
+# Clean up
+	rm -Rf $(top_builddir)/vlc-${VERSION}
+
+
 package-beos:
 # Check that tmp isn't in the way
 	@if test -e $(srcdir)/tmp; then \