Definitely, I agree. Thanks for fixing it, Martyn. Your fix looks right to me.
- V Martyn Shaw wrote: > Ouch! > > LRN wrote: > >> Update of /cvsroot/audacity/audacity-src/win/Projects/Audacity >> In directory >> 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10949/win/Projects/Audacity >> >> Modified Files: >> Audacity.vcproj >> Log Message: >> Forward-ported FFmpeg-0.5 compatibility code >> >> Index: Audacity.vcproj >> =================================================================== >> RCS file: >> /cvsroot/audacity/audacity-src/win/Projects/Audacity/Audacity.vcproj,v >> retrieving revision 1.53 >> retrieving revision 1.54 >> diff -u -d -r1.53 -r1.54 >> --- Audacity.vcproj 17 Aug 2009 22:11:36 -0000 1.53 >> +++ Audacity.vcproj 31 Aug 2009 21:38:28 -0000 1.54 >> @@ -133,7 +133,7 @@ >> <Tool >> Name="VCCLCompilerTool" >> Optimization="0" >> - >> AdditionalIncludeDirectories=""$(WXWIN)\lib\vc_dll\mswud";"$(WXWIN)\include";..\..;..\..\..\src\include\win32;..\..\..\src\include;"..\..\..\lib-src\FileDialog";"..\..\..\lib-src\expat";"..\..\..\lib-src\ffmpeg\win32";"..\..\..\lib-src\ffmpeg";"..\..\..\lib-src\lib-widget-extra";"..\..\..\lib-src\libflac\include";"..\..\..\lib-src\libid3tag";"..\..\..\lib-src\liblrdf";"..\..\..\lib-src\libmad";"..\..\..\lib-src\libnyquist";"..\..\..\lib-src\libogg\include";"..\..\..\lib-src\libresample\include";"..\..\..\lib-src\libsamplerate\src";"..\..\..\lib-src\libscorealign";..\libsndfile;"..\..\..\lib-src\libvamp";"..\..\..\lib-src\libvorbis\include";"..\..\..\lib-src\portaudio-v19\include";"..\..\..\lib-src\portmixer\include";"..\..\..\lib-src\portsmf";"..\..\..\lib- >> > src\redland\raptor\src";"..\..\..\lib-src\slv2";"..\..\..\lib-src\sbsms\include";"..\..\..\lib-src\soundtouch\include";"..\..\..\lib-src\twolame\libtwolame";"..\..\..\lib-src\portmidi\pm_common";"..\..\..\lib-src\portmidi\pm_win";"..\..\..\lib-src\portmidi\porttime"" > >> + >> AdditionalIncludeDirectories=""d:\projects\wxWidgets-2.8.8\lib\vc_dll\mswud";"d:\projects\wxWidgets-2.8.8\include";..\..;..\..\..\src\include\win32;..\..\..\src\include;"..\..\..\lib-src\FileDialog";"..\..\..\lib-src\expat";"..\..\..\lib-src\lib-widget-extra";"..\..\..\lib-src\libflac\include";"..\..\..\lib-src\libid3tag";"..\..\..\lib-src\liblrdf";"..\..\..\lib-src\libmad";"..\..\..\lib-src\libnyquist";"..\..\..\lib-src\libogg\include";"..\..\..\lib-src\libresample\include";"..\..\..\lib-src\libsamplerate\src";"..\..\..\lib-src\libscorealign";..\libsndfile;"..\..\..\lib-src\libvamp";"..\..\..\lib-src\libvorbis\include";"..\..\..\lib-src\portaudio-v19\include";"..\..\..\lib-src\portmixer\include";"..\..\..\lib-src\portsmf";"..\..\..\lib-src\redland\raptor\src";"..\.. >> > \..\lib-src\slv2";"..\..\..\lib-src\sbsms\include";"..\..\..\lib-src\soundtouch\include";"..\..\..\lib-src\twolame\libtwolame";"..\..\..\lib-src\portmidi\pm_common";"..\..\..\lib-src\portmidi\pm_win";"..\..\..\lib-src\portmidi\porttime";"..\..\..\lib-src\ffmpeg\win32";"..\..\..\lib-src\ffmpeg\stable"" > > Ouch! Use $(WXWIN)! > > Ouch again! lib-src\ffmpeg\stable is not in CVS. I changed it to > point to lib-src\ffmpeg so at least I can compile again. I've no idea > if that is a good plan. > > Please check that patches work on a clean checkout in future. > > TTFN > Martyn > > >> >> PreprocessorDefinitions="BUILDING_AUDACITY;FLAC__NO_DLL;__STDC_CONSTANT_MACROS;WXUSINGDLL;__WXMSW__;__WXDEBUG__;_DEBUG;WIN32;STRICT" >> StringPooling="true" >> BasicRuntimeChecks="3" >> >> >> ------------------------------------------------------------------------------ >> Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day >> trial. Simplify your report design, integration and deployment - and focus >> on >> what you do best, core application coding. Discover what's new with >> Crystal Reports now. http://p.sf.net/sfu/bobj-july >> _______________________________________________ >> Audacity-cvs mailing list >> Audacity-cvs@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/audacity-cvs >> >> > > ------------------------------------------------------------------------------ > Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day > trial. Simplify your report design, integration and deployment - and focus on > what you do best, core application coding. Discover what's new with > Crystal Reports now. http://p.sf.net/sfu/bobj-july > _______________________________________________ > audacity-devel mailing list > audacity-de...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/audacity-devel > > ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
