From: <jpg...@us...> - 2008-04-07 15:37:58
|
Revision: 1396 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1396&view=rev Author: jpgrayson Date: 2008-04-07 08:27:20 -0700 (Mon, 07 Apr 2008) Log Message: ----------- VS2005 build fixes from stevebvt. Thank you! - Copy libiaxclient.dll files to output directories of testcall and vtestcall so those programs can run easily. - Fix library search paths for debug iaxclient. - Add Debug_dll configuration for vtestcall. Modified Paths: -------------- trunk/contrib/win/vs2005/iaxclient.sln trunk/contrib/win/vs2005/libiaxclient.vcproj trunk/contrib/win/vs2005/testcall.vcproj trunk/contrib/win/vs2005/vtestcall.vcproj Modified: trunk/contrib/win/vs2005/iaxclient.sln =================================================================== --- trunk/contrib/win/vs2005/iaxclient.sln 2008-04-04 21:37:07 UTC (rev 1395) +++ trunk/contrib/win/vs2005/iaxclient.sln 2008-04-07 15:27:20 UTC (rev 1396) @@ -189,20 +189,16 @@ {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo|Win32.Build.0 = Release_novideo|Win32 {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release|Win32.ActiveCfg = Release|Win32 {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release|Win32.Build.0 = Release|Win32 - {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.ActiveCfg = Debug|Win32 - {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.Build.0 = Debug|Win32 + {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32 + {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.Build.0 = Debug_dll|Win32 {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32 - {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32 {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.ActiveCfg = Debug|Win32 - {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.Build.0 = Debug|Win32 {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug|Win32.ActiveCfg = Debug|Win32 {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug|Win32.Build.0 = Debug|Win32 - {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.ActiveCfg = Release|Win32 - {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.Build.0 = Release|Win32 + {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.ActiveCfg = Release_dll|Win32 + {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.Build.0 = Release_dll|Win32 {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32 - {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo_dll|Win32.Build.0 = Release|Win32 {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.ActiveCfg = Release|Win32 - {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.Build.0 = Release|Win32 {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.ActiveCfg = Release|Win32 {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.Build.0 = Release|Win32 {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.ActiveCfg = Debug|Win32 Modified: trunk/contrib/win/vs2005/libiaxclient.vcproj =================================================================== --- trunk/contrib/win/vs2005/libiaxclient.vcproj 2008-04-04 21:37:07 UTC (rev 1395) +++ trunk/contrib/win/vs2005/libiaxclient.vcproj 2008-04-07 15:27:20 UTC (rev 1396) @@ -535,7 +535,7 @@ Name="VCLinkerTool" LinkLibraryDependencies="false" AdditionalDependencies="libiax2.lib libportmixer.lib libportaudio.lib libgsm.lib libspeex.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib" - AdditionalLibraryDirectories=""$(SolutionDir)Release\libiax2";"$(SolutionDir)Release\libportaudio";"$(SolutionDir)Release\libportmixer";"$(SolutionDir)Release\libspeex";"$(SolutionDir)Release\libgsm"" + AdditionalLibraryDirectories=""$(SolutionDir)Debug\libiax2";"$(SolutionDir)Debug\libportaudio";"$(SolutionDir)Debug\libportmixer";"$(SolutionDir)Debug\libspeex";"$(SolutionDir)Debug\libgsm"" /> <Tool Name="VCALinkTool" Modified: trunk/contrib/win/vs2005/testcall.vcproj =================================================================== --- trunk/contrib/win/vs2005/testcall.vcproj 2008-04-04 21:37:07 UTC (rev 1395) +++ trunk/contrib/win/vs2005/testcall.vcproj 2008-04-07 15:27:20 UTC (rev 1396) @@ -416,6 +416,7 @@ /> <Tool Name="VCPostBuildEventTool" + CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)" /> </Configuration> <Configuration @@ -496,6 +497,7 @@ /> <Tool Name="VCPostBuildEventTool" + CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)" /> </Configuration> <Configuration @@ -577,6 +579,7 @@ /> <Tool Name="VCPostBuildEventTool" + CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)" /> </Configuration> <Configuration @@ -657,6 +660,7 @@ /> <Tool Name="VCPostBuildEventTool" + CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)" /> </Configuration> </Configurations> Modified: trunk/contrib/win/vs2005/vtestcall.vcproj =================================================================== --- trunk/contrib/win/vs2005/vtestcall.vcproj 2008-04-04 21:37:07 UTC (rev 1395) +++ trunk/contrib/win/vs2005/vtestcall.vcproj 2008-04-07 15:27:20 UTC (rev 1396) @@ -174,6 +174,167 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Debug_dll|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\..\lib;..\..\..\..\SDL\include" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + WarningLevel="3" + DebugInformationFormat="4" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + IgnoreImportLibrary="false" + AdditionalDependencies="libiaxclient.lib SDL.lib wsock32.lib winmm.lib strmiids.lib" + LinkIncremental="2" + AdditionalLibraryDirectories=""$(DXSDK_DIR)\lib\x86";..\..\..\..\SDL\lib;$(SolutionDir)$(ConfigurationName)\libiaxclient" + IgnoreDefaultLibraryNames="libcmtd.lib" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)" + /> + </Configuration> + <Configuration + Name="Release_dll|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\..\lib;..\..\..\..\SDL\include" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS" + RuntimeLibrary="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + IgnoreImportLibrary="false" + AdditionalDependencies="libiaxclient.lib SDL.lib wsock32.lib winmm.lib strmiids.lib" + LinkIncremental="1" + AdditionalLibraryDirectories="..\..\..\..\SDL\lib;$(SolutionDir)$(ConfigurationName)\libiaxclient" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)" + /> + </Configuration> </Configurations> <References> </References> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |