diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj
index a7d994914..01b39657c 100755
--- a/win/Projects/Audacity/Audacity.vcxproj
+++ b/win/Projects/Audacity/Audacity.vcxproj
@@ -74,7 +74,6 @@
expat.lib;filedialog.lib;libsndfile.lib;portaudio-v19.lib;wxbase28u.lib;wxbase28u_net.lib;wxmsw28u_adv.lib;wxmsw28u_core.lib;wxmsw28u_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)
$(OutDir);$(WXWIN)\lib\vc_dll;$(GSTREAMER_SDK)\lib;%(AdditionalLibraryDirectories)
- dsound.lib;%(IgnoreSpecificDefaultLibraries)
Windows
8388608
false
@@ -110,7 +109,6 @@
expat.lib;filedialog.lib;libsndfile.lib;portaudio-v19.lib;wxbase28ud.lib;wxbase28ud_net.lib;wxmsw28ud_adv.lib;wxmsw28ud_core.lib;wxmsw28ud_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)
$(OutDir);$(WXWIN)\lib\vc_dll;$(GSTREAMER_SDK)\lib;%(AdditionalLibraryDirectories)
- dsound.lib;%(IgnoreSpecificDefaultLibraries)
true
Windows
8388608
diff --git a/win/Projects/portaudio-v19/portaudio-v19.vcxproj b/win/Projects/portaudio-v19/portaudio-v19.vcxproj
index aa18b50dd..4e7efef99 100755
--- a/win/Projects/portaudio-v19/portaudio-v19.vcxproj
+++ b/win/Projects/portaudio-v19/portaudio-v19.vcxproj
@@ -55,13 +55,13 @@ setlocal EnableDelayedExpansion
set CFG="$(ProjectDir)/$(IntDir)config.h"
echo // Automatically generated file >!CFG!
-IF NOT "!DXSDK_DIR!" == "" echo #define PA_USE_DS 1 >>!CFG!
IF NOT "!ASIOSDK_DIR!" == "" echo #define PA_USE_ASIO 1 >>!CFG!
IF NOT "!JACKSDK_DIR!" == "" echo #define PA_USE_JACK 1 >>!CFG!
IF NOT "!JACKSDK_DIR!" == "" echo #define PA_DYNAMIC_JACK 1 >>!CFG!
echo #define PA_USE_WDMKS 1 >>!CFG!
echo #define PA_USE_WASAPI 1 >>!CFG!
echo #define PA_USE_WMME 1 >>!CFG!
+echo #define PA_USE_DS 1 >>!CFG!
@@ -86,16 +86,6 @@ set INTDIR=$(Configuration)
set CFLAGS=/O2 /GL /I "!BASE!/include" /I "!BASE!/src/common" /I "!BASE!/src/os/win" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_MBCS" /GF /FD /EHsc /MD /Gy /Fo"!INTDIR!/" /Fd"!INTDIR!/" /W3 /nologo /c /wd4996 /FI "!CFG!" /errorReport:prompt
set LIBS=
-find "PA_USE_DS 1" "!CFG!"
-IF ERRORLEVEL 1 goto NoDS
-
-cl !CFLAGS! /I "!DXSDK_DIR!/include" "!BASE!/src/hostapi/dsound/pa_win_ds.c"
-cl !CFLAGS! /I "!DXSDK_DIR!/include" "!BASE!/src/hostapi/dsound/pa_win_ds_dynlink.c"
-
-set LIBS="!DXSDK_DIR!/lib/x86\dxguid.lib"
-
-:NoDS
-
find "PA_USE_WASAPI 1" "!CFG!"
IF ERRORLEVEL 1 goto NoWASAPI
@@ -140,13 +130,13 @@ setlocal EnableDelayedExpansion
set CFG="$(ProjectDir)/$(IntDir)config.h"
echo // Automatically generated file >!CFG!
-IF NOT "!DXSDK_DIR!" == "" echo #define PA_USE_DS 1 >>!CFG!
IF NOT "!ASIOSDK_DIR!" == "" echo #define PA_USE_ASIO 1 >>!CFG!
IF NOT "!JACKSDK_DIR!" == "" echo #define PA_USE_JACK 1 >>!CFG!
IF NOT "!JACKSDK_DIR!" == "" echo #define PA_DYNAMIC_JACK 1 >>!CFG!
echo #define PA_USE_WDMKS 1 >>!CFG!
echo #define PA_USE_WASAPI 1 >>!CFG!
echo #define PA_USE_WMME 1 >>!CFG!
+echo #define PA_USE_DS 1 >>!CFG!
@@ -173,16 +163,6 @@ set INTDIR=$(Configuration)
set CFLAGS=/Od /I "!BASE!/include" /I "!BASE!/src/common" /I "!BASE!/src/os/win" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "_MBCS" /GF /FD /EHsc /RTC1 /MDd /Gy /W3 /nologo /c /ZI /wd4996 /Fo"!INTDIR!/" /FI "!CFG!" /errorReport:prompt
set LIBS=
-find "PA_USE_DS 1" "!CFG!"
-IF ERRORLEVEL 1 goto NoDS
-
-cl !CFLAGS! /I "!DXSDK_DIR!/include" "!BASE!/src/hostapi/dsound/pa_win_ds.c"
-cl !CFLAGS! /I "!DXSDK_DIR!/include" "!BASE!/src/hostapi/dsound/pa_win_ds_dynlink.c"
-
-set LIBS="!DXSDK_DIR!/lib/x86\dxguid.lib"
-
-:NoDS
-
find "PA_USE_WASAPI 1" "!CFG!"
IF ERRORLEVEL 1 goto NoWASAPI
@@ -237,14 +217,8 @@ lib /OUT:"$(TargetPath)" "!INTDIR!/*.obj" !LIBS!
true
true
-
- true
- true
-
-
- true
- true
-
+
+
true
true
@@ -285,10 +259,7 @@ lib /OUT:"$(TargetPath)" "!INTDIR!/*.obj" !LIBS!
-
- true
- true
-
+
true
true
diff --git a/win/Projects/portmixer/portmixer.vcxproj b/win/Projects/portmixer/portmixer.vcxproj
index 511a4d523..a442e79f8 100755
--- a/win/Projects/portmixer/portmixer.vcxproj
+++ b/win/Projects/portmixer/portmixer.vcxproj
@@ -54,7 +54,7 @@
set CFG="$(ProjectDir)/$(IntDir)config.h"
echo // Automatically generated file >"!CFG!"
-IF NOT "!DXSDK_DIR!" == "" echo #define PX_USE_WIN_DSOUND 1 >>"!CFG!"
+echo #define PX_USE_WIN_DSOUND 1 >>"!CFG!"
echo #define PX_USE_WIN_MME 1 >>"!CFG!"
echo #define PX_USE_WIN_WASAPI 1 >>"!CFG!"
@@ -73,19 +73,24 @@ echo #define PX_USE_WIN_WASAPI 1 >>"!CFG!"
$(ProjectDir)\$(Configuration)\config.h;%(ForcedIncludeFiles)
- setlocal EnableDelayedExpansion
+ rem
+rem With the upgrade to VS2013, this not longer really needed,
+rem but leaving here for possible future use
+rem
+
+setlocal EnableDelayedExpansion
set BASE="../../../lib-src/portmixer"
set INTDIR=$(Configuration)
set CFLAGS=/O2 /GL /I "!BASE!/../portaudio-v19/include" /I "!BASE!/include" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "PX_USE_WIN_MME" /D "_MBCS" /GF /FD /EHsc /MD /Gy /Fo"!INTDIR!/" /Fd"!INTDIR!/" /W3 /nologo /c /wd4996 /FI "$(ProjectDir)/$(Configuration)/config.h" /errorReport:prompt
set LIBS=
-if "!DXSDK_DIR!"=="" goto NoDX
+rem if "!DXSDK_DIR!"=="" goto NoDX
-cl !CFLAGS! /I "!DXSDK_DIR!/include" "!BASE!/src/px_win_ds.c"
+rem cl !CFLAGS! /I "!DXSDK_DIR!/include" "!BASE!/src/px_win_ds.c"
-set LIBS="!DXSDK_DIR!/lib/x86/dxguid.lib"
+rem set LIBS="!DXSDK_DIR!/lib/x86/dxguid.lib"
-:NoDX
+rem :NoDX
lib /OUT:"$(TargetPath)" "$(IntDir)*.obj" !LIBS!
@@ -97,7 +102,7 @@ lib /OUT:"$(TargetPath)" "$(IntDir)*.obj" !LIBS!
set CFG="$(ProjectDir)/$(IntDir)config.h"
echo // Automatically generated file >"!CFG!"
-IF NOT "!DXSDK_DIR!" == "" echo #define PX_USE_WIN_DSOUND 1 >>"!CFG!"
+echo #define PX_USE_WIN_DSOUND 1 >>"!CFG!"
echo #define PX_USE_WIN_MME 1 >>"!CFG!"
echo #define PX_USE_WIN_WASAPI 1 >>"!CFG!"
@@ -118,19 +123,24 @@ echo #define PX_USE_WIN_WASAPI 1 >>"!CFG!"
$(ProjectDir)\$(Configuration)\config.h;%(ForcedIncludeFiles)
- setlocal EnableDelayedExpansion
+ rem
+rem With the upgrade to VS2013, this not longer really needed,
+rem but leaving here for possible future use
+rem
+
+setlocal EnableDelayedExpansion
set BASE="../../../lib-src/portmixer"
set INTDIR=$(Configuration)
set CFLAGS=/Od /I "!BASE!/../portaudio-v19/include" /I "!BASE!/include" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "PX_USE_WIN_MME" /D "_MBCS" /GF /FD /EHsc /RTC1 /MDd /Gy /Fo"!INTDIR!/" /Fd"!INTDIR!/" /W3 /nologo /c /ZI /wd4996 /FI "$(ProjectDir)/$(Configuration)/config.h" /errorReport:prompt
set LIBS=
-if "!DXSDK_DIR!"=="" goto NoDX
+rem if "!DXSDK_DIR!"=="" goto NoDX
-cl !CFLAGS! /I "!DXSDK_DIR!/include" "!BASE!/src/px_win_ds.c"
+rem cl !CFLAGS! /I "!DXSDK_DIR!/include" "!BASE!/src/px_win_ds.c"
-set LIBS="!DXSDK_DIR!/lib/x86/dxguid.lib"
+rem set LIBS="!DXSDK_DIR!/lib/x86/dxguid.lib"
-:NoDX
+rem :NoDX
lib /OUT:"$(TargetPath)" "$(IntDir)*.obj" !LIBS!
@@ -139,10 +149,7 @@ lib /OUT:"$(TargetPath)" "$(IntDir)*.obj" !LIBS!
-
- true
- true
-
+