Update of /cvsroot/audacity/audacity-src/win
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv23704
Modified Files:
audacity.vcproj
Log Message:
Support new FileDialgo and add new export options
Index: audacity.vcproj
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/audacity.vcproj,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- audacity.vcproj 26 Mar 2007 08:22:46 -0000 1.64
+++ audacity.vcproj 6 Apr 2007 11:03:24 -0000 1.65
@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\mswd";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include";"..\lib-src\twolame\libtwolame""
+
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\mswd";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\FileDialog";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include";"..\lib-src\twolame\libtwolame""
PreprocessorDefinitions="_DEBUG;DEBUG=1;__WXDEBUG__;__WX__;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;FLAC__NO_DLL"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
@@ -79,11 +79,11 @@
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions="/IGNORE:4049"
- AdditionalDependencies="allegrod.lib expatd.lib
portmixerd.lib sndfiled.lib wxbase26d.lib wxbase26d_net.lib wxmsw26d_adv.lib
wxmsw26d_core.lib wxmsw26d_html.lib wxpngd.lib wxzlibd.lib wxjpegd.lib
wxtiffd.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib oleacc.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib"
+ AdditionalDependencies="allegrod.lib expatd.lib
filedialogd.lib portmixerd.lib sndfiled.lib wxbase26d.lib wxbase26d_net.lib
wxmsw26d_adv.lib wxmsw26d_core.lib wxmsw26d_html.lib wxpngd.lib wxzlibd.lib
wxjpegd.lib wxtiffd.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib
oleacc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
OutputFile=".\$(ConfigurationName)/audacity.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
-
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\portaudio\winproj\lib";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"..\lib-src\twolame\winproj\$(ConfigurationName)""
+
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\FileDialog";"..\lib-src\expat";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\portaudio\winproj\lib";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"..\lib-src\twolame\winproj\$(ConfigurationName)""
IgnoreDefaultLibraryNames="dsound.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(ConfigurationName)/audacity.pdb"
@@ -151,7 +151,7 @@
AdditionalOptions="/O2 /GA /GL"
Optimization="2"
InlineFunctionExpansion="2"
-
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\msw";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include";"..\lib-src\twolame\libtwolame""
+
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\msw";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\FileDialog";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include";"..\lib-src\twolame\libtwolame""
PreprocessorDefinitions="NDEBUG;__WX__;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;FLAC__NO_DLL"
StringPooling="true"
RuntimeLibrary="0"
@@ -180,11 +180,11 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
- AdditionalDependencies="allegro.lib expat.lib
portmixer.lib sndfile.lib wxbase26.lib wxbase26_net.lib wxmsw26_adv.lib
wxmsw26_core.lib wxmsw26_html.lib wxpng.lib wxzlib.lib wxjpeg.lib wxtiff.lib
comctl32.lib rpcrt4.lib wsock32.lib winmm.lib oleacc.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
ole32.lib oleaut32.lib uuid.lib"
+ AdditionalDependencies="allegro.lib expat.lib
filedialog.lib portmixer.lib sndfile.lib wxbase26.lib wxbase26_net.lib
wxmsw26_adv.lib wxmsw26_core.lib wxmsw26_html.lib wxpng.lib wxzlib.lib
wxjpeg.lib wxtiff.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib oleacc.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib"
OutputFile=".\$(ConfigurationName)/audacity.exe"
LinkIncremental="0"
SuppressStartupBanner="true"
-
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\portaudio\winproj\lib";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"..\lib-src\twolame\winproj\$(ConfigurationName)""
+
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\FileDialog";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\portaudio\winproj\lib";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"..\lib-src\twolame\winproj\$(ConfigurationName)""
IgnoreDefaultLibraryNames="dsound.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(ConfigurationName)/audacity.pdb"
@@ -250,7 +250,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\mswud";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include";"..\lib-src\twolame\libtwolame""
+
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\mswud";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\FileDialog";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include";"..\lib-src\twolame\libtwolame""
PreprocessorDefinitions="_DEBUG;DEBUG=1;__WXDEBUG__;__WX__;wxUSE_UNICODE=1;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;FLAC__NO_DLL"
RuntimeLibrary="1"
TreatWChar_tAsBuiltInType="true"
@@ -283,11 +283,11 @@
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalOptions="/IGNORE:4049"
- AdditionalDependencies="allegroud.lib
expatud.lib portmixerud.lib sndfileud.lib wxbase26ud.lib wxbase26ud_net.lib
wxmsw26ud_adv.lib wxmsw26ud_core.lib wxmsw26ud_html.lib wxpngud.lib
wxzlibud.lib wxjpegud.lib wxtiffud.lib comctl32.lib rpcrt4.lib wsock32.lib
winmm.lib oleacc.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
$(NOINHERIT)"
+ AdditionalDependencies="allegroud.lib
expatud.lib filedialogud.lib portmixerud.lib sndfileud.lib wxbase26ud.lib
wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_core.lib wxmsw26ud_html.lib
wxpngud.lib wxzlibud.lib wxjpegud.lib wxtiffud.lib comctl32.lib rpcrt4.lib
wsock32.lib winmm.lib oleacc.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
$(NOINHERIT)"
OutputFile=".\$(ConfigurationName)/audacity.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
-
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\portaudio\winproj\lib";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"..\lib-src\twolame\winproj\$(ConfigurationName)""
+
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\FileDialog";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\portaudio\winproj\lib";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"..\lib-src\twolame\winproj\$(ConfigurationName)""
IgnoreDefaultLibraryNames="dsound.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(ConfigurationName)/audacity.pdb"
@@ -356,7 +356,7 @@
AdditionalOptions="/O2 /GA /GL"
Optimization="2"
InlineFunctionExpansion="2"
-
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\mswu";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include";"..\lib-src\twolame\libtwolame""
+
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_lib\mswu";.;"$(WXWIN)\include";..\src\include;..\src\include\win32;"..\lib-src\allegro";"..\lib-src\expat";"..\lib-src\FileDialog";"..\lib-src\libid3tag";"..\lib-src\portaudio-v19\include";"..\lib-src\portaudio\pa_common";"..\lib-src\libsndfile\Win32";"..\lib-src\libsndfile\src";"..\lib-src\libmad";"..\lib-src\libogg\include";"..\lib-src\libvorbis\include";"..\lib-src\libnyquist\nyx";"..\lib-src\portmixer\px_common";"..\lib-src\libsamplerate\src";"..\lib-src\libflac\include";"..\lib-src\soundtouch\include";"..\lib-src\libresample\include";"..\lib-src\twolame\libtwolame""
PreprocessorDefinitions="NDEBUG;__WX__;wxUSE_UNICODE=1;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;FLAC__NO_DLL"
StringPooling="true"
RuntimeLibrary="0"
@@ -385,11 +385,11 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
- AdditionalDependencies="allegrou.lib
portmixeru.lib expatu.lib sndfileu.lib wxbase26u.lib wxbase26u_net.lib
wxmsw26u_adv.lib wxmsw26u_core.lib wxmsw26u_html.lib wxpngu.lib wxzlibu.lib
wxjpegu.lib wxtiffu.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib
oleacc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib $(NOINHERIT)"
+ AdditionalDependencies="allegrou.lib
portmixeru.lib expatu.lib filedialogu.lib sndfileu.lib wxbase26u.lib
wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib wxmsw26u_html.lib
wxpngu.lib wxzlibu.lib wxjpegu.lib wxtiffu.lib comctl32.lib rpcrt4.lib
wsock32.lib winmm.lib oleacc.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
$(NOINHERIT)"
OutputFile=".\$(ConfigurationName)/audacity.exe"
LinkIncremental="0"
SuppressStartupBanner="true"
-
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\portaudio\winproj\lib";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"..\lib-src\twolame\winproj\$(ConfigurationName)""
+
AdditionalLibraryDirectories=""$(IntDir)";"..\lib-src\libogg\win32\static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbis_static_$(ConfigurationName)";"..\lib-src\libvorbis\win32\vorbisfile_static_$(ConfigurationName)";"$(WXWIN)\lib\vc_lib";"..\lib-src\libid3tag";"..\lib-src\expat";"..\lib-src\FileDialog";"..\lib-src\libmad";"..\lib-src\libsndfile\Win32";"..\lib-src\portaudio\winproj\lib";"..\lib-src\allegro";"..\lib-src\libnyquist";"..\lib-src\portmixer\winproj";"..\lib-src\libsamplerate\Win32";"..\lib-src\libflac\obj\lib";"..\lib-src\soundtouch\source\SoundTouch\$(ConfigurationName)";"..\lib-src\libresample\win";"..\lib-src\twolame\winproj\$(ConfigurationName)""
IgnoreDefaultLibraryNames="dsound.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(ConfigurationName)/audacity.pdb"
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
