Commit 18b4556f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Propagate changes from previous commit

parent 738fac76
......@@ -1145,14 +1145,16 @@ VLC_EXPORT( const char *, VLC_CompileBy, ( void ) );
VLC_EXPORT( const char *, VLC_CompileHost, ( void ) );
VLC_EXPORT( const char *, VLC_CompileDomain, ( void ) );
VLC_EXPORT( const char *, VLC_Compiler, ( void ) );
VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
VLC_EXPORT( const char *, VLC_Error, ( int ) );
/*****************************************************************************
* Additional vlc stuff
*****************************************************************************/
#ifndef HAVE_SHARED_LIBVLC
VLC_EXPORT( const char *, VLC_Changeset, ( void ) );
# include "vlc_symbols.h"
#else
# define VLC_Changeset( ) ("exported")
#endif
#include "os_specific.h"
#include "vlc_messages.h"
......
......@@ -538,7 +538,9 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_domain",
VLC_CompileDomain() );
E_(mvar_AppendNewVar)( p_args->vars, "vlc_compiler", VLC_Compiler() );
#ifndef HAVE_SHARED_LIBVLC
E_(mvar_AppendNewVar)( p_args->vars, "vlc_changeset", VLC_Changeset() );
#endif
E_(mvar_AppendNewVar)( p_args->vars, "stream_position", position );
E_(mvar_AppendNewVar)( p_args->vars, "stream_time", time );
E_(mvar_AppendNewVar)( p_args->vars, "stream_length", length );
......
......@@ -498,7 +498,9 @@ LRESULT Interface::WndProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
_("Compiled by ") + VLC_CompileBy() + "@" +
VLC_CompileHost() + "." + VLC_CompileDomain() + ".\n" +
_("Compiler: ") + VLC_Compiler() + ".\n" +
#ifndef HAVE_SHARED_LIBVLC
_("Based on SVN revision: ") + VLC_Changeset() + ".\n\n" +
#endif
_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/");
......
......@@ -919,7 +919,9 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") +
wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") +
wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
#ifndef HAVE_SHARED_LIBVLC
wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
#endif
#ifdef __WXMSW__
wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT) ) + wxT("\n\n") +
#else
......
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