mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-16 16:10:06 +02:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
c844f6f214
@ -85,7 +85,7 @@
|
||||
<CompileAs>Default</CompileAs>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>wxmsw3-u_core.lib;wxbase30u.lib;wxmsw30u_html.lib;odbc32.lib;odbccp32.lib;oldnames.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;netapi32.lib;Audacity.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>wxmsw30u_core.lib;wxbase30u.lib;wxmsw30u_html.lib;odbc32.lib;odbccp32.lib;oldnames.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;netapi32.lib;Audacity.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)modules\$(ProjectName).dll</OutputFile>
|
||||
<AdditionalLibraryDirectories>$(WXWIN)\lib\vc_dll;..\..\win\$(IntDir);$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
|
@ -74,15 +74,15 @@ void AudacityLogger::DoLogText(const wxString & str)
|
||||
wxMutexGuiEnter();
|
||||
}
|
||||
|
||||
wxString stamp;
|
||||
|
||||
TimeStamp(&stamp);
|
||||
|
||||
if (mBuffer.IsEmpty()) {
|
||||
wxString stamp;
|
||||
|
||||
TimeStamp(&stamp);
|
||||
|
||||
mBuffer << stamp << wxT("Audacity ") << AUDACITY_VERSION_STRING << wxT("\n");
|
||||
}
|
||||
|
||||
mBuffer << stamp << str << wxT("\n");
|
||||
mBuffer << str << wxT("\n");
|
||||
|
||||
mUpdated = true;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user