Update of /cvsroot/audacity/lib-src/portaudio-v19/build/msvc
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22516/build/msvc
Modified Files:
portaudio.def readme.txt
Added Files:
portaudio.dsp portaudio.dsw portaudio.sln portaudio.vcproj
Removed Files:
Makefile.msvc clean.bat make.bat setenv.bat
Log Message:
Bringing PortAudio up to their latest SVN sources.
--- NEW FILE: portaudio.dsw ---
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "portaudio"=".\portaudio.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################
--- clean.bat DELETED ---
--- make.bat DELETED ---
--- NEW FILE: portaudio.dsp ---
# Microsoft Developer Studio Project File - Name="portaudio" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=portaudio - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "portaudio.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "portaudio.mak" CFG="portaudio - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "portaudio - Win32 Release" (based on "Win32 (x86) Dynamic-Link
Library")
!MESSAGE "portaudio - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "portaudio - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release_x86"
# PROP BASE Intermediate_Dir "Release_x86"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release_x86"
# PROP Intermediate_Dir "Release_x86"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src\common" /I "..\..\include" /I
".\\" /D "WIN32" /D "NDEBUG" /D "_USRDLL" /D "PA_ENABLE_DEBUG_OUTPUT" /D
"_CRT_SECURE_NO_DEPRECATE" /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /machine:I386 /out:"./Release_x86/portaudio_x86.dll"
!ELSEIF "$(CFG)" == "portaudio - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug_x86"
# PROP BASE Intermediate_Dir "Debug_x86"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug_x86"
# PROP Intermediate_Dir "Debug_x86"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\src\common" /I
"..\..\include" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_USRDLL" /D
"PA_ENABLE_DEBUG_OUTPUT" /D "_CRT_SECURE_NO_DEPRECATE" /FD /GZ /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /dll /debug /machine:I386
/out:"./Debug_x86/portaudio_x86.dll" /pdbtype:sept
!ENDIF
# Begin Target
# Name "portaudio - Win32 Release"
# Name "portaudio - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Group "common"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\common\pa_allocation.c
# End Source File
# Begin Source File
SOURCE=..\..\src\common\pa_converters.c
# End Source File
# Begin Source File
SOURCE=..\..\src\common\pa_cpuload.c
# End Source File
# Begin Source File
SOURCE=..\..\src\common\pa_debugprint.c
# End Source File
# Begin Source File
SOURCE=..\..\src\common\pa_dither.c
# End Source File
# Begin Source File
SOURCE=..\..\src\common\pa_front.c
# End Source File
# Begin Source File
SOURCE=..\..\src\common\pa_process.c
# End Source File
# Begin Source File
SOURCE=..\..\src\common\pa_skeleton.c
# End Source File
# Begin Source File
SOURCE=..\..\src\common\pa_stream.c
# End Source File
# End Group
# Begin Group "hostapi"
# PROP Default_Filter ""
# Begin Group "ASIO"
# PROP Default_Filter ""
# Begin Group "ASIOSDK"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\hostapi\asio\ASIOSDK\common\asio.cpp
# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I
"..\..\src\hostapi\asio\ASIOSDK\host\pc" /I
"..\..\src\hostapi\asio\ASIOSDK\common"
# End Source File
# Begin Source File
SOURCE=..\..\src\hostapi\asio\ASIOSDK\host\ASIOConvertSamples.cpp
# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I
"..\..\src\hostapi\asio\ASIOSDK\host\pc" /I
"..\..\src\hostapi\asio\ASIOSDK\common"
# End Source File
# Begin Source File
SOURCE=..\..\src\hostapi\asio\ASIOSDK\host\asiodrivers.cpp
# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I
"..\..\src\hostapi\asio\ASIOSDK\host\pc" /I
"..\..\src\hostapi\asio\ASIOSDK\common"
# End Source File
# Begin Source File
SOURCE=..\..\src\hostapi\asio\ASIOSDK\host\pc\asiolist.cpp
# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I
"..\..\src\hostapi\asio\ASIOSDK\host\pc" /I
"..\..\src\hostapi\asio\ASIOSDK\common"
# End Source File
# Begin Source File
SOURCE=..\..\src\hostapi\asio\ASIOSDK\common\combase.cpp
# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I
"..\..\src\hostapi\asio\ASIOSDK\host\pc" /I
"..\..\src\hostapi\asio\ASIOSDK\common"
# End Source File
# Begin Source File
SOURCE=..\..\src\hostapi\asio\ASIOSDK\common\debugmessage.cpp
# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I
"..\..\src\hostapi\asio\ASIOSDK\host\pc" /I
"..\..\src\hostapi\asio\ASIOSDK\common"
# End Source File
# Begin Source File
SOURCE=..\..\src\hostapi\asio\ASIOSDK\common\register.cpp
# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I
"..\..\src\hostapi\asio\ASIOSDK\host\pc" /I
"..\..\src\hostapi\asio\ASIOSDK\common"
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\src\hostapi\asio\pa_asio.cpp
# ADD CPP /I "..\..\src\hostapi\asio\ASIOSDK\host" /I
"..\..\src\hostapi\asio\ASIOSDK\host\pc" /I
"..\..\src\hostapi\asio\ASIOSDK\common"
# End Source File
# End Group
# Begin Group "dsound"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\hostapi\dsound\pa_win_ds.c
# End Source File
# Begin Source File
SOURCE=..\..\src\hostapi\dsound\pa_win_ds_dynlink.c
# End Source File
# End Group
# Begin Group "wmme"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\hostapi\wmme\pa_win_wmme.c
# End Source File
# End Group
# Begin Group "wasapi"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\hostapi\wasapi\pa_win_wasapi.cpp
# End Source File
# End Group
# End Group
# Begin Group "os"
# PROP Default_Filter ""
# Begin Group "win"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\os\win\pa_win_hostapis.c
# End Source File
# Begin Source File
SOURCE=..\..\src\os\win\pa_win_util.c
# End Source File
# Begin Source File
SOURCE=..\..\src\os\win\pa_x86_plain_converters.c
# End Source File
# End Group
# End Group
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File
SOURCE=.\portaudio.def
# End Source File
# End Group
# End Target
# End Project
--- setenv.bat DELETED ---
--- Makefile.msvc DELETED ---
--- NEW FILE: portaudio.sln ---
(This appears to be a binary file; contents omitted.)
Index: portaudio.def
===================================================================
RCS file: /cvsroot/audacity/lib-src/portaudio-v19/build/msvc/portaudio.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- portaudio.def 10 Jun 2006 21:30:51 -0000 1.1
+++ portaudio.def 23 Sep 2006 18:42:44 -0000 1.2
@@ -1,4 +1,3 @@
-LIBRARY portaudio.dll
EXPORTS
;
@@ -40,4 +39,5 @@
PaAsio_ShowControlPanel @51
PaUtil_InitializeX86PlainConverters @52
PaAsio_GetInputChannelName @53
-PaAsio_GetOutputChannelName @54
\ No newline at end of file
+PaAsio_GetOutputChannelName @54
+PaUtil_SetDebugPrintFunction @55
\ No newline at end of file
--- NEW FILE: portaudio.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="portaudio"
ProjectGUID="{0A18A071-125E-442F-AFF7-A3F68ABECF99}"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
[...1420 lines suppressed...]
</Filter>
</Filter>
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
<File
RelativePath="portaudio.def"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Index: readme.txt
===================================================================
RCS file: /cvsroot/audacity/lib-src/portaudio-v19/build/msvc/readme.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- readme.txt 10 Jun 2006 21:30:51 -0000 1.1
+++ readme.txt 23 Sep 2006 18:42:44 -0000 1.2
@@ -4,53 +4,47 @@
(Currently v19-devel) into a VC6 DLL and lib file.
This DLL contains all 3 current win32 PA APIS (MM/DS/ASIO)
-1)Copy the source dirs that comes with the ASIO SDK inside pa_win\msvc
- so you should now have:
+1)Copy the source dirs that comes with the ASIO SDK inside
src\hostapi\asio\ASIOSDK
+ so you should now have example:
- pa_win\msvc\common
- pa_win\msvc\host
- pa_win\msvc\host\sample
- pa_win\msvc\host\pc
- pa_win\msvc\host\mac (not needed)
+ portaudio19svn\src\hostapi\asio\ASIOSDK\common
+ portaudio19svn\src\hostapi\asio\ASIOSDK\host
+ portaudio19svn\src\hostapi\asio\ASIOSDK\host\sample
+ portaudio19svn\src\hostapi\asio\ASIOSDK\host\pc
+ portaudio19svn\src\hostapi\asio\ASIOSDK\host\mac (not needed)
You dont need "driver"
-2)execure "make.bat", this assumes VC6 is installed in
- C:\Program Files\Microsoft Visual Studio\
+2)If you have Visual Studio 6.0, 7.0(VC.NET/2001) or 7.1(VC.2003)
+ then I suggest you open portaudio.dsp (and convert if needed)
- if its not,
-
- Open a command Prompt and execute "vcvars32.bat" which sets the environment
- so that you can use Microsoft's "nmake"
- EX: C:\Program Files\Microsoft Visual Studio\VC98\Bin\vcvars32.bat
- or (C:\progra~1\micros~2\VC98\bin\vcvars32) dumb de dumb
-
- You should now have seen a line that said:
- "Setting environment for using Microsoft Visual C++ tools."
- While in pa_win\msvc , type "nmake makefile.msvc"
- this _should_ create portaudio.dll and portaudio.lib
+ If you have Visual Studio 2005, I suggest you open the portaudio.sln file
+ which contains 4 configurations. Win32/x64 in both Release and Debug variants
+
+ hit compile and hope for the best.
-3)Now in any VC6 project, in which you require portaudio,
- you can just link with portaudio.lib, and of course include the
+3)Now in any project, in which you require portaudio,
+ you can just link with portaudio_x86.lib, (or _x64) and of course include
the
relevant headers
(portaudio.h, and/or pa_asio.h , pa_x86_plain_converters.h) See (*)
-4) Your new exe should now use portaudio.dll.
+4) Your new exe should now use portaudio_xXX.dll.
Have fun!
(*): you may want to add/remove some DLL entry points.
-Right now those 3 entries are _not_ from portaudio.h
+Right now those 6 entries are _not_ from portaudio.h
(from portaudio.def)
(...)
PaAsio_GetAvailableLatencyValues @50
PaAsio_ShowControlPanel @51
PaUtil_InitializeX86PlainConverters @52
-
+PaAsio_GetInputChannelName @53
+PaAsio_GetOutputChannelName @54
+PaUtil_SetLogPrintFunction @55
-----
-last update April 16th 2003
David Viens, [EMAIL PROTECTED]
\ No newline at end of file
-------------------------------------------------------------------------
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
