Update of /cvsroot/audacity/lib-src/portaudio-v19/build/msvc
In directory
sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv600/lib-src/portaudio-v19/build/msvc
Modified Files:
PAStaticWMMEv19.vcproj
Log Message:
Added ASIO support and a missing file to Windows project files
Index: PAStaticWMMEv19.vcproj
===================================================================
RCS file:
/cvsroot/audacity/lib-src/portaudio-v19/build/msvc/PAStaticWMMEv19.vcproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PAStaticWMMEv19.vcproj 3 Oct 2006 02:41:11 -0000 1.5
+++ PAStaticWMMEv19.vcproj 5 Oct 2006 23:57:12 -0000 1.6
@@ -26,7 +26,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="echo // Automatically generated
file >".\$(ConfigurationName)\config.h"
IF
"%DXSDK_DIR%" == "" echo #define PA_NO_DS
>>".\$(ConfigurationName)\config.h"
"
+ CommandLine="echo // Automatically generated
file >".\$(ConfigurationName)\config.h"
IF
"%DXSDK_DIR%" == "" echo #define PA_NO_DS
>>".\$(ConfigurationName)\config.h"
IF
"%ASIOSDK_DIR%" == "" echo #define PA_NO_ASIO
>>".\$(ConfigurationName)\config.h"
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -46,7 +46,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../include;../../src/common"
-
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_ASIO"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -91,7 +91,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="if
"%DXSDK_DIR%"=="" goto VCEnd

cl /O2
/Ob1 /I "../../include" /I "../../src/common" /I
"%DXSDK_DIR%include" /D "WIN32" /D "NDEBUG" /D
"_LIB" /D "PA_NO_ASIO" /D "_MBCS" /GF /FD /EHsc
/MT /Gy /W3 /c /wd4996 /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"
"..\..\src\hostapi\dsound\pa_win_ds.c"
cl /O2 /Ob1 /I
"../../include" /I "../../src/common" /I
"%DXSDK_DIR%include" /D "WIN32" /D "NDEBUG" /D
"_LIB" /D "PA_NO_ASIO" /D "_MBCS" /GF /FD /EHsc
/MT /Gy /W3 /c /wd4996 /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"
"..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"
lib
/OUT:"$(TargetPath)" .\$(OutDir)\*.obj"
"
+ CommandLine="set CFLAGS=/I
"../../include" /I "../../src/common" /D "WIN32"
/D "NDEBUG" /D "_LIB" /D "_MBCS" /O2 /Ob1 /GF /FD
/EHsc /MT /Gy /W3 /c /wd4996 /nologo /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"

if
"%DXSDK_DIR%"=="" goto NoDX

cl
%CFLAGS% /I "%DXSDK_DIR%include"
"..\..\src\hostapi\dsound\pa_win_ds.c"
cl %CFLAGS% /I
"%DXSDK_DIR%include"
"..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"

:NoDX

if
"%ASIOSDK_DIR%"=="" goto NoASIO

cl
%CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host"
/I "%ASIOSDK_DIR%/host/pc"
"..\..\src\hostapi\asio\pa_asio.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%A
SIOSDK_DIR%/host/pc"
"..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
cl
%CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host"
/I "%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\common\asio.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I
"%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\host\asiodrivers.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I
"%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\host\pc\asiolist.cpp"

:NoASIO

lib
/NOLOGO /OUT:"$(TargetPAth)"
".\$(OutDir)\*.obj"
"
/>
</Configuration>
<Configuration
@@ -106,7 +106,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="echo // Automatically generated
file >".\$(ConfigurationName)\config.h"
IF
"%DXSDK_DIR%" == "" echo #define PA_NO_DS
>>".\$(ConfigurationName)\config.h"
"
+ CommandLine="echo // Automatically generated
file >".\$(ConfigurationName)\config.h"
IF
"%DXSDK_DIR%" == "" echo #define PA_NO_DS
>>".\$(ConfigurationName)\config.h"
IF
"%ASIOSDK_DIR%" == "" echo #define PA_NO_ASIO
>>".\$(ConfigurationName)\config.h"
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -124,7 +124,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include;../../src/common"
-
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_ASIO"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -169,7 +169,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="if
"%DXSDK_DIR%"=="" goto VCEnd

cl /Od
/I "../../include" /I "../../src/common" /I
"%DXSDK_DIR%include" /D "WIN32" /D "_DEBUG" /D
"_LIB" /D "PA_NO_ASIO" /D "_MBCS" /FD /EHsc /RTC1
/MTd /W3 /c /ZI /wd4996 /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"
"..\..\src\hostapi\dsound\pa_win_ds.c"
cl /Od /I
"../../include" /I "../../src/common" /I
"%DXSDK_DIR%include" /D "WIN32" /D "_DEBUG" /D
"_LIB" /D "PA_NO_ASIO" /D "_MBCS" /FD /EHsc /RTC1
/MTd /W3 /c /ZI /wd4996 /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"
"..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"
lib
/OUT:"$(TargetPAth)" ".\$(OutDir)\*.obj"
"
+ CommandLine="set CFLAGS= /I
"../../include" /I "../../src/common" /D "WIN32"
/D "_DEBUG" /D "_LIB" /D "_MBCS" /Od /FD /EHsc
/RTC1 /MTd /W3 /c /ZI /wd4996 /nologo /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"

if
"%DXSDK_DIR%"=="" goto NoDX

cl
%CFLAGS% /I "%DXSDK_DIR%include"
"..\..\src\hostapi\dsound\pa_win_ds.c"
cl %CFLAGS% /I
"%DXSDK_DIR%include"
"..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"

:NoDX

if
"%ASIOSDK_DIR%"=="" goto NoASIO

cl
%CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host"
/I "%ASIOSDK_DIR%/host/pc"
"..\..\src\hostapi\asio\pa_asio.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%AS
IOSDK_DIR%/host/pc"
"..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
cl
%CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host"
/I "%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\common\asio.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I
"%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\host\asiodrivers.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I
"%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\host\pc\asiolist.cpp"

:NoASIO

lib
/NOLOGO /OUT:"$(TargetPAth)"
".\$(OutDir)\*.obj"
"
/>
</Configuration>
<Configuration
@@ -184,7 +184,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="echo // Automatically generated
file >".\$(ConfigurationName)\config.h"
IF
"%DXSDK_DIR%" == "" echo #define PA_NO_DS
>>".\$(ConfigurationName)\config.h"
"
+ CommandLine="echo // Automatically generated
file >".\$(ConfigurationName)\config.h"
IF
"%DXSDK_DIR%" == "" echo #define PA_NO_DS
>>".\$(ConfigurationName)\config.h"
IF
"%ASIOSDK_DIR%" == "" echo #define PA_NO_ASIO
>>".\$(ConfigurationName)\config.h"
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -202,7 +202,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../include;../../src/common"
-
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_ASIO"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -247,7 +247,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="if
"%DXSDK_DIR%"=="" goto VCEnd

cl /Od
/I "../../include" /I "../../src/common" /I
"%DXSDK_DIR%include" /D "WIN32" /D "_DEBUG" /D
"_LIB" /D "PA_NO_ASIO" /D "_MBCS" /FD /EHsc /RTC1
/MTd /W3 /c /ZI /wd4996 /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"
"..\..\src\hostapi\dsound\pa_win_ds.c"
cl /Od /I
"../../include" /I "../../src/common" /I
"%DXSDK_DIR%include" /D "WIN32" /D "_DEBUG" /D
"_LIB" /D "PA_NO_ASIO" /D "_MBCS" /FD /EHsc /RTC1
/MTd /W3 /c /ZI /wd4996 /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"
"..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"
lib
/OUT:"$(TargetPAth)" ".\$(OutDir)\*.obj"
"
+ CommandLine="set CFLAGS= /I
"../../include" /I "../../src/common" /D "WIN32"
/D "_DEBUG" /D "_LIB" /D "_MBCS" /Od /FD /EHsc
/RTC1 /MTd /W3 /c /ZI /wd4996 /nologo /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"

if
"%DXSDK_DIR%"=="" goto NoDX

cl
%CFLAGS% /I "%DXSDK_DIR%include"
"..\..\src\hostapi\dsound\pa_win_ds.c"
cl %CFLAGS% /I
"%DXSDK_DIR%include"
"..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"

:NoDX

if
"%ASIOSDK_DIR%"=="" goto NoASIO

cl
%CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host"
/I "%ASIOSDK_DIR%/host/pc"
"..\..\src\hostapi\asio\pa_asio.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%AS
IOSDK_DIR%/host/pc"
"..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
cl
%CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host"
/I "%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\common\asio.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I
"%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\host\asiodrivers.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I
"%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\host\pc\asiolist.cpp"

:NoASIO

lib
/NOLOGO /OUT:"$(TargetPAth)"
".\$(OutDir)\*.obj"
"
/>
</Configuration>
<Configuration
@@ -262,7 +262,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="echo // Automatically generated
file >".\$(ConfigurationName)\config.h"
IF
"%DXSDK_DIR%" == "" echo #define PA_NO_DS
>>".\$(ConfigurationName)\config.h"
"
+ CommandLine="echo // Automatically generated
file >".\$(ConfigurationName)\config.h"
IF
"%DXSDK_DIR%" == "" echo #define PA_NO_DS
>>".\$(ConfigurationName)\config.h"
IF
"%ASIOSDK_DIR%" == "" echo #define PA_NO_ASIO
>>".\$(ConfigurationName)\config.h"
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -282,7 +282,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../include;../../src/common"
-
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_ASIO"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -327,7 +327,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="if
"%DXSDK_DIR%"=="" goto VCEnd

cl /O2
/Ob1 /I "../../include" /I "../../src/common" /I
"%DXSDK_DIR%include" /D "WIN32" /D "NDEBUG" /D
"_LIB" /D "PA_NO_ASIO" /D "_MBCS" /GF /FD /EHsc
/MT /Gy /W3 /c /wd4996 /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"
"..\..\src\hostapi\dsound\pa_win_ds.c"
cl /O2 /Ob1 /I
"../../include" /I "../../src/common" /I
"%DXSDK_DIR%include" /D "WIN32" /D "NDEBUG" /D
"_LIB" /D "PA_NO_ASIO" /D "_MBCS" /GF /FD /EHsc
/MT /Gy /W3 /c /wd4996 /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"
"..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"
lib
/OUT:"$(TargetPath)" .\$(OutDir)\*.obj"
"
+ CommandLine="set CFLAGS=/I
"../../include" /I "../../src/common" /D "WIN32"
/D "NDEBUG" /D "_LIB" /D "_MBCS" /O2 /Ob1 /GF /FD
/EHsc /MT /Gy /W3 /c /wd4996 /nologo /Fo".\$(OutDir)/"
/Fd".\$(OutDir)/"

if
"%DXSDK_DIR%"=="" goto NoDX

cl
%CFLAGS% /I "%DXSDK_DIR%include"
"..\..\src\hostapi\dsound\pa_win_ds.c"
cl %CFLAGS% /I
"%DXSDK_DIR%include"
"..\..\src\hostapi\dsound\pa_win_ds_dynlink.c"

:NoDX

if
"%ASIOSDK_DIR%"=="" goto NoASIO

cl
%CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host"
/I "%ASIOSDK_DIR%/host/pc"
"..\..\src\hostapi\asio\pa_asio.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I "%A
SIOSDK_DIR%/host/pc"
"..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
cl
%CFLAGS% /I "%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host"
/I "%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\common\asio.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I
"%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\host\asiodrivers.cpp"
cl %CFLAGS% /I
"%ASIOSDK_DIR%/common" /I "%ASIOSDK_DIR%/host" /I
"%ASIOSDK_DIR%/host/pc"
"%ASIOSDK_DIR%\host\pc\asiolist.cpp"

:NoASIO

lib
/NOLOGO /OUT:"$(TargetPAth)"
".\$(OutDir)\*.obj"
"
/>
</Configuration>
</Configurations>
@@ -585,6 +585,118 @@
</FileConfiguration>
</File>
</Filter>
+ <Filter
+ Name="asio"
+ >
+ <File
+
RelativePath="..\..\src\hostapi\asio\iasiothiscallresolver.cpp"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+
Name="Unicode_Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+
Name="Unicode_Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath="..\..\src\hostapi\asio\iasiothiscallresolver.h"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+
Name="Unicode_Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+
Name="Unicode_Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+
RelativePath="..\..\src\hostapi\asio\pa_asio.cpp"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+
Name="Unicode_Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+
Name="Unicode_Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+
Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
</Filter>
<Filter
Name="os"
-------------------------------------------------------------------------
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
