From ae26b3a636374ac55d9fbc3c30c1df4c738af3b8 Mon Sep 17 00:00:00 2001 From: Michael Jerris <mike@jerris.com> Date: Fri, 9 Dec 2005 00:43:06 +0000 Subject: [PATCH] PortAudio lib autobuild. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@98 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- w32/vsnet/GetLibs.vbs | 4 ++-- w32/vsnet/mod_PortAudio.vcproj | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs index 80102268d3..4abb24750a 100644 --- a/w32/vsnet/GetLibs.vbs +++ b/w32/vsnet/GetLibs.vbs @@ -264,12 +264,12 @@ Sub BuildLibs_ModPortAudio(BuildDebug, BuildRelease) End If If FSO.FolderExists(LibDestDir & "PortAudio") Then If BuildDebug Then - If Not FSO.FileExists(LibDestDir & "PortAudio\Lib\PAStaticWMMED.lib") Then + If Not FSO.FileExists(LibDestDir & "PortAudio\winvc\Lib\PAStaticWMMED.lib") Then BuildViaVCBuild LibDestDir & "PortAudio\winvc\PAStaticWMME\PAStaticWMME.vcproj", "Debug" End If End If If BuildRelease Then - If Not FSO.FileExists(LibDestDir & "PortAudio\Lib\PAStaticWMME.lib") Then + If Not FSO.FileExists(LibDestDir & "PortAudio\winvc\Lib\PAStaticWMME.lib") Then BuildViaVCBuild LibDestDir & "PortAudio\winvc\PAStaticWMME\PAStaticWMME.vcproj", "Release" End If End If diff --git a/w32/vsnet/mod_PortAudio.vcproj b/w32/vsnet/mod_PortAudio.vcproj index ef4478fba3..d2da06e1d2 100644 --- a/w32/vsnet/mod_PortAudio.vcproj +++ b/w32/vsnet/mod_PortAudio.vcproj @@ -25,7 +25,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="" + CommandLine="cscript /nologo $(InputDir)getlibs.vbs Mod_PortAudio Debug" /> <Tool Name="VCCustomBuildTool" @@ -42,11 +42,11 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\libs\apr\include";"$(InputDir)..\..\..\libs\portaudio\pa_common";"$(InputDir)..\..\..\libs\portaudio\pablio";"$(InputDir)..\..\..\libs\portaudio\pa_win_wmme"" + AdditionalIncludeDirectories=""$(ProjectDir)..\..\src\include";"$(ProjectDir)include";"$(ProjectDir)..\..\libs\apr\include";"$(ProjectDir)..\..\libs\portaudio\pa_common";"$(ProjectDir)..\..\libs\portaudio\pablio";"$(ProjectDir)..\..\libs\portaudio\pa_win_wmme"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" @@ -67,7 +67,7 @@ AdditionalDependencies="libapr-1.lib Ws2_32.lib Iphlpapi.lib PAStaticWMMED.lib Winmm.lib" OutputFile="$(OutDir)/mod/mod_PortAudio.dll" LinkIncremental="2" - AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\Debug";"$(InputDir)..\..\libs\portaudio\winvc\Lib";"$(InputDir)..\..\libs\iax\Debug"" + AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\Debug";"$(InputDir)..\..\libs\portaudio\winvc\Lib"" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/mod_PortAudio.pdb" SubSystem="2" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\libs\apr\include";"$(InputDir)..\..\..\libs\iax\src"" + AdditionalIncludeDirectories=""$(ProjectDir)..\..\src\include";"$(ProjectDir)include";"$(ProjectDir)..\..\libs\apr\include";"$(ProjectDir)..\..\libs\portaudio\pa_common";"$(ProjectDir)..\..\libs\portaudio\pablio";"$(ProjectDir)..\..\libs\portaudio\pa_win_wmme"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="0" UsePrecompiledHeader="0" @@ -144,10 +144,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libapr-1.lib libiax2.lib" + AdditionalDependencies="libapr-1.lib Ws2_32.lib Iphlpapi.lib PAStaticWMME.lib Winmm.lib" OutputFile="$(OutDir)/mod/mod_PortAudio.dll" LinkIncremental="1" - AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\Release";"$(InputDir)..\..\libs\iax\Release"" + AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\Release";"$(InputDir)..\..\libs\portaudio\winvc\Lib"" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2"