mirror of https://code.videolan.org/videolan/vlc
* ./bootstrap: we touch m4/Makefile.am so that configure doesn't complain
about a missing m4/Makefile.in. * ./include/vlc_common.h: workaround for Borland's redefinition of PACKAGE.
This commit is contained in:
Sam Hocevar
parent
15f3b0f6fa
commit
685f8edcc3
|
|
@ -1,7 +1,7 @@
|
|||
#! /bin/sh
|
||||
|
||||
## bootstrap.sh file for vlc, the VideoLAN Client
|
||||
## $Id: bootstrap,v 1.5 2002/08/26 21:46:06 sam Exp $
|
||||
## $Id: bootstrap,v 1.6 2002/08/26 23:36:20 sam Exp $
|
||||
##
|
||||
## Authors: Samuel Hocevar <sam@zoy.org>
|
||||
|
||||
|
|
@ -50,6 +50,8 @@ else
|
|||
# do cp ${aclocaldir}/${file} m4/
|
||||
#done
|
||||
# Yuck!
|
||||
touch m4/Makefile.am
|
||||
# Yuck!
|
||||
echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' > m4/gettext.m4
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -53,9 +53,6 @@ fi
|
|||
|
||||
dnl Gettext stuff
|
||||
ALL_LINGUAS="de en_GB fr ja no ru nl pl se"
|
||||
|
||||
AC_DEFINE_UNQUOTED(VLC_PACKAGE, "${PACKAGE}", [Package name])
|
||||
AC_DEFINE_UNQUOTED(VLC_VERSION, "${VERSION}", [Package version])
|
||||
AM_GNU_GETTEXT_VERSION(0.10.40)
|
||||
AM_GNU_GETTEXT
|
||||
|
||||
|
|
@ -2072,8 +2069,6 @@ AC_SUBST(RELEASE)
|
|||
AC_SUBST(MOC)
|
||||
AC_SUBST(WINDRES)
|
||||
AC_SUBST(BCBUILDER)
|
||||
AC_SUBST(PACKAGE)
|
||||
AC_SUBST(VERSION)
|
||||
AC_SUBST(NEED_GETOPT)
|
||||
AC_SUBST(MOZILLA)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* vlc.h: global header for vlc
|
||||
*****************************************************************************
|
||||
* Copyright (C) 1998, 1999, 2000 VideoLAN
|
||||
* $Id: vlc.h,v 1.12 2002/08/26 08:36:12 sam Exp $
|
||||
* $Id: vlc.h,v 1.13 2002/08/26 23:36:20 sam Exp $
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -95,17 +95,7 @@ typedef int vlc_status_t;
|
|||
* Required internal headers
|
||||
*****************************************************************************/
|
||||
#if defined( __VLC__ )
|
||||
# include "config.h"
|
||||
# include "vlc_config.h"
|
||||
# include "modules_inner.h"
|
||||
# include "vlc_common.h"
|
||||
# include "os_specific.h"
|
||||
# include "vlc_messages.h"
|
||||
# include "mtime.h"
|
||||
# include "modules.h"
|
||||
# include "main.h"
|
||||
# include "configuration.h"
|
||||
# include "vlc_objects.h"
|
||||
#endif
|
||||
|
||||
/*****************************************************************************
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Collection of useful common types and macros definitions
|
||||
*****************************************************************************
|
||||
* Copyright (C) 1998, 1999, 2000 VideoLAN
|
||||
* $Id: vlc_common.h,v 1.23 2002/08/21 23:19:58 sam Exp $
|
||||
* $Id: vlc_common.h,v 1.24 2002/08/26 23:36:20 sam Exp $
|
||||
*
|
||||
* Authors: Samuel Hocevar <sam@via.ecp.fr>
|
||||
* Vincent Seguin <seguin@via.ecp.fr>
|
||||
|
|
@ -25,13 +25,22 @@
|
|||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
* Compiler-specific workarounds
|
||||
* Required vlc headers
|
||||
*****************************************************************************/
|
||||
#if defined( __BORLANDC__ )
|
||||
# undef PACKAGE
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#if defined( __BORLANDC__ )
|
||||
# undef HAVE_VARIADIC_MACROS
|
||||
# undef HAVE_STDINT_H
|
||||
#endif
|
||||
|
||||
#include "vlc_config.h"
|
||||
#include "modules_inner.h"
|
||||
|
||||
/*****************************************************************************
|
||||
* Required system headers
|
||||
*****************************************************************************/
|
||||
|
|
@ -464,11 +473,6 @@ typedef __int64 off_t;
|
|||
/*****************************************************************************
|
||||
* I18n stuff
|
||||
*****************************************************************************/
|
||||
#ifndef PACKAGE /* Borland C++ uses this ! */
|
||||
#define PACKAGE VLC_PACKAGE
|
||||
#endif
|
||||
#define VERSION VLC_VERSION
|
||||
|
||||
#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT ) && !defined( __BORLANDC__ ) && !defined( NEED_GNOMESUPPORT_H )
|
||||
# include <libintl.h>
|
||||
# undef _
|
||||
|
|
@ -484,6 +488,19 @@ typedef __int64 off_t;
|
|||
#endif
|
||||
|
||||
/*****************************************************************************
|
||||
* Plug-in stuff
|
||||
* Additional vlc stuff
|
||||
*****************************************************************************/
|
||||
#include "vlc_symbols.h"
|
||||
#include "os_specific.h"
|
||||
#include "vlc_messages.h"
|
||||
#include "mtime.h"
|
||||
#include "modules.h"
|
||||
#include "main.h"
|
||||
#include "configuration.h"
|
||||
#include "vlc_objects.h"
|
||||
|
||||
#if defined( __BORLANDC__ )
|
||||
# undef PACKAGE
|
||||
# define PACKAGE
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ __fastcall TAboutDlg::TAboutDlg( TComponent* Owner )
|
|||
: TForm( Owner )
|
||||
{
|
||||
Image1->Picture->Icon = p_intfGlobal->p_sys->p_window->Icon;
|
||||
LabelVersion->Caption = "Version " VLC_VERSION;
|
||||
LabelVersion->Caption = "Version " VERSION;
|
||||
}
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue