Update of /cvsroot/audacity/audacity-src/win/Projects/Audacity
In directory
sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18786/win/Projects/Audacity
Modified Files:
Audacity.vcproj
Log Message:
Replaced allegro with portsmf as part of removing the EXPERIMENTAL_NOTE_TRACK
flag and replacing it with USE_MIDI. Changed ImportMIDI significantly to work
with the new library. Although allegro is no longer used when building
Audacity, it has not yet been removed from CVS and will be removed once it is
determined that portsmf causes no (additional) problems for developers. Built
and tested on Windows XP, untested on OSX and Linux.
Index: Audacity.vcproj
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/Projects/Audacity/Audacity.vcproj,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Audacity.vcproj 11 Jul 2008 04:51:50 -0000 1.13
+++ Audacity.vcproj 11 Jul 2008 15:39:25 -0000 1.14
@@ -210,7 +210,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_dll\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";"..\..\..\lib-src\libvamp";
"..\..\..\lib-src\lib-widget-extra";"..\..\..\lib-src\ffmpeg";"..\..\..\lib-src\ffmpeg\win32";"..\..\..\lib-src\liblrdf";..\raptor;"..\..\..\lib-src\redland\raptor\src";..\slv2;"..\..\..\lib-src\slv2""
+
AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_dll\mswd";..\..;"$(WXWIN)\include";..\..\..\src\include;..\..\..\src\include\win32;"..\..\..\lib-src\portsmf";"..\..\..\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";"..\..\..\lib-src\libvamp";
"..\..\..\lib-src\lib-widget-extra";"..\..\..\lib-src\ffmpeg";"..\..\..\lib-src\ffmpeg\win32";"..\..\..\lib-src\liblrdf";..\raptor;"..\..\..\lib-src\redland\raptor\src";..\slv2;"..\..\..\lib-src\slv2""
PreprocessorDefinitions="BUILDING_AUDACITY;FLAC__NO_DLL;WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT"
StringPooling="true"
BasicRuntimeChecks="3"
@@ -239,7 +239,7 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="false"
- AdditionalDependencies="allegro.lib
filedialog.lib libsndfile.lib wxbase28d.lib wxbase28d_net.lib wxmsw28d_adv.lib
wxmsw28d_core.lib wxmsw28d_html.lib wxexpatd.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="portsmf.lib
filedialog.lib libsndfile.lib wxbase28d.lib wxbase28d_net.lib wxmsw28d_adv.lib
wxmsw28d_core.lib wxmsw28d_html.lib wxexpatd.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"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(OutDir)";"$(WXWIN)\lib\vc_dll""
IgnoreDefaultLibraryNames="dsound.lib"
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
