Commit 96347da3 authored by Gildas Bazin's avatar Gildas Bazin

* configure.ac.in, Makefile.am, install-win32: fixed the package-win32 make
   target, and included the locales in the installer script.
* src/libvlc.c: on win32 we look for the locales in vlc's directory.
parent fb3612d9
......@@ -525,19 +525,27 @@ package-win32:
cp vlc.exe tmp/
$(STRIP) tmp/vlc.exe
cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
for file in AUTHORS COPYING ChangeLog README THANKS NEWS ; \
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
do cp $$file tmp/$${file}.txt ; \
unix2dos tmp/$${file}.txt ; done
mkdir tmp/plugins
for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
$(INSTALL) $$i tmp/plugins/ ; \
fi ; done
# don't include these two
#rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so
for i in dummy tmp/plugins/*$(LIBEXT) ; do if test $$i != tmp/plugins/intfwin.so -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
for i in dummy tmp/plugins/*$(LIBEXT) ; \
do if test $$i != tmp/plugins/libwin32_plugin.$(LIBEXT) \
-a $$i != dummy ; then $(STRIP) $$i ; fi ; done
mkdir tmp/share
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/share/ ; done
cp share/*.rle tmp/share/ ;
mkdir tmp/locale
for i in $(ALL_LINGUAS); do \
mkdir -p tmp/locale/$${i}/LC_MESSAGES ; \
cp po/$${i}.gmo tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
done
# Create package
wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi
# Clean up
......
......@@ -2934,6 +2934,7 @@ AC_SUBST(WINDRES)
AC_SUBST(XPIDL)
AC_SUBST(LIBEXT)
AC_SUBST(INCLUDES)
AC_SUBST(ALL_LINGUAS)
AC_SUBST(CFLAGS_TUNING)
AC_SUBST(CFLAGS_OPTIM)
......
......@@ -5,6 +5,8 @@
;;;;;;;;;;;;;
; CHANGELOG ;
;;;;;;;;;;;;;
; modifications by Gildas Bazin <gbazin@netcourrier.com> 26 Feb 2003
; . added the locale directory.
; modifications by Samuel Hocevar <sam@zoy.org> 05 Apr 2002
; . no need for @VERSION@ anymore
; . updated script for NSIS 1.96.
......@@ -56,6 +58,7 @@ Section "Install"
File /r share
File /r plugins
File /r locale
CreateDirectory "$SMPROGRAMS\VideoLAN"
CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" "$INSTDIR\vlc.exe"
......@@ -79,6 +82,8 @@ Section "Uninstall"
RMDir $INSTDIR\share
Delete $INSTDIR\plugins\*
RMDir $INSTDIR\plugins
Delete $INSTDIR\locale\*
RMDir $INSTDIR\locale
Delete $INSTDIR\*
RMDir $INSTDIR
DeleteRegKey HKLM SOFTWARE\VideoLAN
......
......@@ -2,7 +2,7 @@
* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.c,v 1.66 2003/02/20 01:52:46 sigmunau Exp $
* $Id: libvlc.c,v 1.67 2003/02/26 19:39:43 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -979,7 +979,7 @@ static void SetLanguage ( char const *psz_lang )
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
char * psz_path;
#ifdef SYS_DARWIN
#if defined( SYS_DARWIN ) || defined ( WIN32 )
char psz_tmp[1024];
#endif
......@@ -1003,7 +1003,7 @@ static void SetLanguage ( char const *psz_lang )
setlocale( LC_CTYPE, psz_lang );
/* Specify where to find the locales for current domain */
#ifndef SYS_DARWIN
#if !defined( SYS_DARWIN ) && !defined( WIN32 )
psz_path = LOCALEDIR;
#else
snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc.psz_vlcpath,
......
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