mirror of
https://github.com/cookiengineer/audacity
synced 2025-04-30 07:39:42 +02:00
Update replacement files for wxWidgets 2.8.11, so new options are supported. Eliminate changes that have no effect, to make it easier to update in future. Reduce verbiage. Add installation options.
This commit is contained in:
v.audacity
parent
275e7f1de1
commit
4f6c56450a
@ -217,6 +217,7 @@ Global
|
||||
{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
|
||||
{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
|
||||
{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
|
||||
{5284D863-3813-479F-BBF0-AC234E216BC6}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{5284D863-3813-479F-BBF0-AC234E216BC6}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{5284D863-3813-479F-BBF0-AC234E216BC6}.Release|Win32.ActiveCfg = Release|Win32
|
||||
@ -328,7 +329,9 @@ Global
|
||||
{02F94A40-586A-4403-8464-13B50801FFEC}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{02F94A40-586A-4403-8464-13B50801FFEC}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{02F94A40-586A-4403-8464-13B50801FFEC}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
|
||||
{02F94A40-586A-4403-8464-13B50801FFEC}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
|
||||
{02F94A40-586A-4403-8464-13B50801FFEC}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
|
||||
{02F94A40-586A-4403-8464-13B50801FFEC}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -185,17 +185,22 @@ directory where you installed Python to your Path environment
|
||||
variable. For instructions on setting environment variables, see the
|
||||
previous section, "MSVC++ STEP 4: Set wxWidgets location for Audacity".
|
||||
|
||||
Build the "help" project by enabling it in the MSVC++ Configuration
|
||||
Manager. This will download a copy of the Manual wiki onto your machine
|
||||
and copy it to the correct place for your build. If the local copy needs
|
||||
updating at any time, run audacity\scripts\mw2html_audacity\wiki2htm.bat
|
||||
Build the "help" project by enabling it in the MS Visual Studio
|
||||
Configuration Manager (Build menu). This will download a copy of the
|
||||
Manual wiki onto your machine and copy it to the correct place for
|
||||
your build. If the local copy needs to be updated, run
|
||||
audacity\scripts\mw2html_audacity\wiki2htm.bat
|
||||
and re-build the "help" project.
|
||||
|
||||
|
||||
2. To support languages other than English in your build of Audacity,
|
||||
you must enable and build the optional "locale" project. This is
|
||||
required for a full release. You will need to obtain msgfmt.exe from
|
||||
http://audacity.sourceforge.net/files/msgfmt.zip. Add the location of
|
||||
the directory containing msgfmt.exe to your Path environment variable.
|
||||
the directory containing msgfmt.exe to your Path environment variable.
|
||||
Alternatively, put msgfmt.exe somewhere already in the Path,
|
||||
e.g., C:\Windows\System32.
|
||||
|
||||
|
||||
3. Some functionality in Audacity is currently turned on its default
|
||||
configuration, but requires that extra libraries be downloaded
|
||||
@ -207,10 +212,11 @@ separately to use it.
|
||||
* To allow import and export of a much wider range of audio formats
|
||||
(including WMA, M4A and AC3), and to import audio from video files,
|
||||
download FFmpeg:
|
||||
http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins#installffmpeg
|
||||
http://www.audacityteam.org/manual/index.php?title=FAQ:Installation_and_Plug-Ins#installffmpeg
|
||||
|
||||
To change the libraries that are enabled in Audacity, open the file
|
||||
"win\configwin.h" and comment or uncomment the libraries as required.
|
||||
"win\configwin.h" and comment or uncomment the libraries as desired.
|
||||
|
||||
|
||||
4. DirectSound (Microsoft) and ASIO (Steinberg) are sound card interface
|
||||
protocols that are more efficient than the standard WMME. Unlike WMME,
|
||||
@ -237,15 +243,16 @@ ASIO support, for personal use, you cannot distribute them without
|
||||
violating the Audacity license and the ASIO license.
|
||||
If you build ASIO support into Audacity, do not distribute that build.
|
||||
|
||||
If you wish ASIO support, install the ASIO SDK from Steinberg
|
||||
(http://www.steinberg.net ... select Company, then 3rd Party
|
||||
Developers), then define an environment variable called
|
||||
ASIOSDK_DIR, as you did for WXWIN, above. The value should be
|
||||
If you would like ASIO support, install the ASIO SDK from Steinberg
|
||||
(http://www.steinberg.net ... select Company, then Developer),
|
||||
install at C:\ASIOSDK, then define an environment variable called
|
||||
ASIOSDK_DIR, as for WXWIN, above. The value should be
|
||||
the full path to the base directory of the ASIO SDK, e.g.,
|
||||
|
||||
set ASIOSDK_DIR=C:\ASIOSDK2
|
||||
|
||||
|
||||
|
||||
-----------------------
|
||||
MSVC++ STEP 6: Build Audacity
|
||||
-----------------------
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 2003-02-12
|
||||
// RCS-ID: $Id: access.cpp,v 1.2 2008-10-23 03:12:30 windinthew Exp $
|
||||
// RCS-ID: $Id: access.cpp 62067 2009-09-24 10:15:06Z JS $
|
||||
// Copyright: (c) 2003 Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -187,7 +187,8 @@ class wxIAccessible : public IAccessible
|
||||
{
|
||||
public:
|
||||
wxIAccessible(wxAccessible *pAccessible);
|
||||
// Called to indicate object should prepare to be deleted.
|
||||
|
||||
// Called to indicate object should prepare to be deleted.
|
||||
void Quiesce();
|
||||
|
||||
DECLARE_IUNKNOWN_METHODS;
|
||||
@ -338,6 +339,7 @@ public:
|
||||
private:
|
||||
wxAccessible *m_pAccessible; // pointer to C++ class we belong to
|
||||
bool m_bQuiescing; // Object is to be deleted
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxIAccessible)
|
||||
};
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id: setup.h,v 1.3 2009-07-06 02:42:42 windinthew Exp $
|
||||
// RCS-ID: $Id: setup0.h 60190 2009-04-16 00:57:35Z KO $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -579,6 +579,18 @@
|
||||
#define wxUSE_GRAPHICS_CONTEXT 0
|
||||
#endif
|
||||
|
||||
// Enable the new wxCairoContext classes for an advanced
|
||||
// 2D drawing API. (Still somewhat experimental)
|
||||
//
|
||||
// Please note that you will need to link with Cairo for this to work.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 1
|
||||
#ifndef wxUSE_CAIRO
|
||||
#define wxUSE_CAIRO 0
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Individual GUI controls
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -1042,7 +1054,7 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// wxSingleInstanceChecker class allows to verify at startup if another program
|
||||
// instance is running (it is only available under Win32)
|
||||
W// instance is running (available only under Win32).
|
||||
//
|
||||
// Default is 1
|
||||
//
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user