Update of /cvsroot/audacity/audacity-src/win
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv26940

Modified Files:
        audacity.sln audacity.vcproj 
Log Message:
New configuration that builds with /MDd, so Debug wx284 doesn't have this one 
lib that's built with /MTd (which introduces MSVCRTD vs libcmtd errors.

Index: audacity.sln
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/audacity.sln,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- audacity.sln        14 May 2008 04:22:07 -0000      1.27
+++ audacity.sln        15 May 2008 00:26:04 -0000      1.28
@@ -327,8 +327,8 @@
                
{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.Unicode_Release|Win32.Build.0 = 
Unicode_Release|Win32
                {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug 
DLL|Win32.ActiveCfg = Debug DLL|Win32
                {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug DLL|Win32.Build.0 
= Debug DLL|Win32
-               {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug 
wx284|Win32.ActiveCfg = Debug|Win32
-               {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug 
wx284|Win32.Build.0 = Debug|Win32
+               {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug 
wx284|Win32.ActiveCfg = Debug wx284|Win32
+               {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug 
wx284|Win32.Build.0 = Debug wx284|Win32
                {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug|Win32.ActiveCfg = 
Debug|Win32
                {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug|Win32.Build.0 = 
Debug|Win32
                {8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Release|Win32.ActiveCfg 
= Release|Win32

Index: audacity.vcproj
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/audacity.vcproj,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- audacity.vcproj     14 May 2008 22:51:33 -0000      1.79
+++ audacity.vcproj     15 May 2008 00:26:04 -0000      1.80
@@ -486,12 +486,12 @@
                                Name="VCLinkerTool"
                                LinkLibraryDependencies="false"
                                AdditionalOptions="/IGNORE:4049"
-                               AdditionalDependencies="MSVCRTD.lib libcmtd.lib 
allegrod.lib expatd.lib filedialogd.lib portmixerd.lib sndfiled.lib libvamp.lib 
wxbase28d.lib wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_core.lib 
wxmsw28d_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 libvamp.lib wxbase28d.lib 
wxbase28d_net.lib wxmsw28d_adv.lib wxmsw28d_core.lib wxmsw28d_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_dll";"..\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\libvamp";"..\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\win32\lib";"..\lib-src\libvamp\win\$(ConfigurationName)""
-                               
IgnoreDefaultLibraryNames="dsound.lib;libcmt;MSVCRTD"
+                               IgnoreDefaultLibraryNames="dsound.lib"
                                GenerateDebugInformation="true"
                                
ProgramDatabaseFile=".\$(ConfigurationName)/audacity.pdb"
                                SubSystem="2"


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft 
Defy all challenges. Microsoft(R) Visual Studio 2008. 
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to