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

Modified Files:
        audacity.vcproj 
Log Message:
Conditionally link against libraries based on USE_library macros.

Index: audacity.vcproj
===================================================================
RCS file: /cvsroot/audacity/audacity-src/win/audacity.vcproj,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- audacity.vcproj     19 Mar 2007 00:28:30 -0000      1.63
+++ audacity.vcproj     26 Mar 2007 08:22:46 -0000      1.64
@@ -79,8 +79,7 @@
                                Name="VCLinkerTool"
                                LinkLibraryDependencies="false"
                                AdditionalOptions="/IGNORE:4049"
-                               AdditionalDependencies="libtwolame_static.lib 
allegrod.lib libresampled.lib soundtouchd.lib libsamplerated.lib portmixerd.lib 
libnyquistd.lib libid3tagd.lib expatd.lib madd.lib sndfiled.lib wxbase26d.lib 
wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_core.lib wxmsw26d_html.lib 
ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib wxpngd.lib 
wxzlibd.lib wxjpegd.lib wxtiffd.lib libFLAC++d.lib libFLACd.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"
-                               ShowProgress="0"
+                               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"
                                OutputFile=".\$(ConfigurationName)/audacity.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
@@ -181,8 +180,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                LinkLibraryDependencies="false"
-                               AdditionalDependencies="libtwolame_static.lib 
allegro.lib libresample.lib soundtouch.lib libsamplerate.lib portmixer.lib 
libnyquist.lib libid3tag.lib expat.lib mad.lib sndfile.lib wxbase26.lib 
wxbase26_net.lib wxmsw26_adv.lib wxmsw26_core.lib wxmsw26_html.lib 
ogg_static.lib vorbis_static.lib vorbisfile_static.lib wxpng.lib wxzlib.lib 
wxjpeg.lib wxtiff.lib libFLAC++.lib libFLAC.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"
-                               ShowProgress="0"
+                               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"
                                OutputFile=".\$(ConfigurationName)/audacity.exe"
                                LinkIncremental="0"
                                SuppressStartupBanner="true"
@@ -285,8 +283,7 @@
                                Name="VCLinkerTool"
                                LinkLibraryDependencies="false"
                                AdditionalOptions="/IGNORE:4049"
-                               AdditionalDependencies="libtwolame_static.lib 
allegroud.lib libresampleud.lib soundtouchud.lib libsamplerateud.lib 
portmixerud.lib libnyquistud.lib libid3tagud.lib expatud.lib madud.lib 
sndfileud.lib wxbase26ud.lib wxbase26ud_net.lib wxmsw26ud_adv.lib 
wxmsw26ud_core.lib wxmsw26ud_html.lib ogg_static_ud.lib vorbis_static_ud.lib 
vorbisfile_static_ud.lib wxpngud.lib wxzlibud.lib wxjpegud.lib wxtiffud.lib 
libFLAC++ud.lib libFLACud.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)"
-                               ShowProgress="0"
+                               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)"
                                OutputFile=".\$(ConfigurationName)/audacity.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
@@ -388,8 +385,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                LinkLibraryDependencies="false"
-                               AdditionalDependencies="libtwolame_static.lib 
allegrou.lib libresampleu.lib soundtouchu.lib libsamplerateu.lib portmixeru.lib 
libnyquistu.lib libid3tagu.lib expatu.lib madu.lib sndfileu.lib wxbase26u.lib 
wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_core.lib wxmsw26u_html.lib 
ogg_static_u.lib vorbis_static_u.lib vorbisfile_static_u.lib wxpngu.lib 
wxzlibu.lib wxjpegu.lib wxtiffu.lib libFLAC++u.lib libFLACu.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)"
-                               ShowProgress="0"
+                               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)"
                                OutputFile=".\$(ConfigurationName)/audacity.exe"
                                LinkIncremental="0"
                                SuppressStartupBanner="true"


-------------------------------------------------------------------------
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

Reply via email to