Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-31 07:59:27 +02:00
Code Issues Releases Wiki Activity

Remove conditional build of DirectX support

Browse Source 
With the move to VS2013, we no longer need the DirectX SDK
and, therefore, we can always enable DirectX support.

If an individual user doesn't want DirectX support, they can
always disable it for their private copy.  But, I believe we
will always release with DX support, so it is now on always.

For those that have the DX SDK installed just for building
Audacity, you may now remove it and you should still get
DX support in Audacity.
This commit is contained in:
lllucius 2014-10-08 03:56:43 +00:00
parent c6faffd731
commit 19b9fc5f91
3 changed files with 28 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
win/Projects/Audacity/Audacity.vcxproj
View File

@ -74,7 +74,6 @@
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);$(WXWIN)\lib\vc_dll;$(GSTREAMER_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>dsound.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<SubSystem>Windows</SubSystem>
<StackReserveSize>8388608</StackReserveSize>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@ -110,7 +109,6 @@
<Link>
<AdditionalDependencies>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)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);$(WXWIN)\lib\vc_dll;$(GSTREAMER_SDK)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>dsound.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<StackReserveSize>8388608</StackReserveSize>

39
win/Projects/portaudio-v19/portaudio-v19.vcxproj
View File

@ -55,13 +55,13 @@ setlocal EnableDelayedExpansion
set CFG="$(ProjectDir)/$(IntDir)config.h"
echo // Automatically generated file &gt;!CFG!
IF NOT "!DXSDK_DIR!" == "" echo #define PA_USE_DS 1 &gt;&gt;!CFG!
IF NOT "!ASIOSDK_DIR!" == "" echo #define PA_USE_ASIO 1 &gt;&gt;!CFG!
IF NOT "!JACKSDK_DIR!" == "" echo #define PA_USE_JACK 1 &gt;&gt;!CFG!
IF NOT "!JACKSDK_DIR!" == "" echo #define PA_DYNAMIC_JACK 1 &gt;&gt;!CFG!
echo #define PA_USE_WDMKS 1 &gt;&gt;!CFG!
echo #define PA_USE_WASAPI 1 &gt;&gt;!CFG!
echo #define PA_USE_WMME 1 &gt;&gt;!CFG!
echo #define PA_USE_DS 1 &gt;&gt;!CFG!
</Command>
</PreBuildEvent>
<ClCompile>
@ -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 &gt;!CFG!
IF NOT "!DXSDK_DIR!" == "" echo #define PA_USE_DS 1 &gt;&gt;!CFG!
IF NOT "!ASIOSDK_DIR!" == "" echo #define PA_USE_ASIO 1 &gt;&gt;!CFG!
IF NOT "!JACKSDK_DIR!" == "" echo #define PA_USE_JACK 1 &gt;&gt;!CFG!
IF NOT "!JACKSDK_DIR!" == "" echo #define PA_DYNAMIC_JACK 1 &gt;&gt;!CFG!
echo #define PA_USE_WDMKS 1 &gt;&gt;!CFG!
echo #define PA_USE_WASAPI 1 &gt;&gt;!CFG!
echo #define PA_USE_WMME 1 &gt;&gt;!CFG!
echo #define PA_USE_DS 1 &gt;&gt;!CFG!
</Command>
</PreBuildEvent>
<ClCompile>
@ -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!
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\lib-src\portaudio-v19\src\hostapi\dsound\pa_win_ds.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\lib-src\portaudio-v19\src\hostapi\dsound\pa_win_ds_dynlink.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\lib-src\portaudio-v19\src\hostapi\dsound\pa_win_ds.c" />
<ClCompile Include="..\..\..\lib-src\portaudio-v19\src\hostapi\dsound\pa_win_ds_dynlink.c" />
<ClCompile Include="..\..\..\lib-src\portaudio-v19\src\hostapi\asio\iasiothiscallresolver.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@ -285,10 +259,7 @@ lib /OUT:"$(TargetPath)" "!INTDIR!/*.obj" !LIBS!
<ClInclude Include="..\..\..\lib-src\portaudio-v19\src\common\pa_trace.h" />
<ClInclude Include="..\..\..\lib-src\portaudio-v19\src\common\pa_types.h" />
<ClInclude Include="..\..\..\lib-src\portaudio-v19\src\common\pa_util.h" />
<CustomBuild Include="..\..\..\lib-src\portaudio-v19\src\hostapi\dsound\pa_win_ds_dynlink.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\lib-src\portaudio-v19\src\hostapi\dsound\pa_win_ds_dynlink.h" />
<CustomBuild Include="..\..\..\lib-src\portaudio-v19\src\hostapi\asio\iasiothiscallresolver.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

39
win/Projects/portmixer/portmixer.vcxproj
View File

@ -54,7 +54,7 @@
set CFG="$(ProjectDir)/$(IntDir)config.h"
echo // Automatically generated file &gt;"!CFG!"
IF NOT "!DXSDK_DIR!" == "" echo #define PX_USE_WIN_DSOUND 1 &gt;&gt;"!CFG!"
echo #define PX_USE_WIN_DSOUND 1 &gt;&gt;"!CFG!"
echo #define PX_USE_WIN_MME 1 &gt;&gt;"!CFG!"
echo #define PX_USE_WIN_WASAPI 1 &gt;&gt;"!CFG!"
</Command>
@ -73,19 +73,24 @@ echo #define PX_USE_WIN_WASAPI 1 &gt;&gt;"!CFG!"
<ForcedIncludeFiles>$(ProjectDir)\$(Configuration)\config.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<PostBuildEvent>
<Command>setlocal EnableDelayedExpansion
<Command>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!
</Command>
@ -97,7 +102,7 @@ lib /OUT:"$(TargetPath)" "$(IntDir)*.obj" !LIBS!
set CFG="$(ProjectDir)/$(IntDir)config.h"
echo // Automatically generated file &gt;"!CFG!"
IF NOT "!DXSDK_DIR!" == "" echo #define PX_USE_WIN_DSOUND 1 &gt;&gt;"!CFG!"
echo #define PX_USE_WIN_DSOUND 1 &gt;&gt;"!CFG!"
echo #define PX_USE_WIN_MME 1 &gt;&gt;"!CFG!"
echo #define PX_USE_WIN_WASAPI 1 &gt;&gt;"!CFG!"
</Command>
@ -118,19 +123,24 @@ echo #define PX_USE_WIN_WASAPI 1 &gt;&gt;"!CFG!"
<ForcedIncludeFiles>$(ProjectDir)\$(Configuration)\config.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<PostBuildEvent>
<Command>setlocal EnableDelayedExpansion
<Command>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!
</Command>
@ -139,10 +149,7 @@ lib /OUT:"$(TargetPath)" "$(IntDir)*.obj" !LIBS!
<ItemGroup>
<ClCompile Include="..\..\..\lib-src\portmixer\src\px_mixer.c" />
<ClCompile Include="..\..\..\lib-src\portmixer\src\px_win_common.c" />
<ClCompile Include="..\..\..\lib-src\portmixer\src\px_win_ds.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\lib-src\portmixer\src\px_win_ds.c" />
<ClCompile Include="..\..\..\lib-src\portmixer\src\px_win_endpoint.c" />
<ClCompile Include="..\..\..\lib-src\portmixer\src\px_win_wasapi.c" />
<ClCompile Include="..\..\..\lib-src\portmixer\src\px_win_wmme.c" />