From: <jpg...@us...> - 2008-04-07 16:01:56
|
Revision: 1399 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1399&view=rev Author: jpgrayson Date: 2008-04-07 09:01:53 -0700 (Mon, 07 Apr 2008) Log Message: ----------- Merge revisions 1389:1398 from trunk into the 2.1 branch. - Add Visual Studio project and solution for iaxcomm. - Fix 'make dist'. - Fix to make iaxc_version() (an API function) always defined. - Add novideo VS2005 configurations. - Numerous fixes to VS2005 projects. Modified Paths: -------------- branches/2.1/Makefile.am branches/2.1/contrib/win/vs2005/iaxclient.sln branches/2.1/contrib/win/vs2005/libiaxclient.vcproj branches/2.1/contrib/win/vs2005/testcall.vcproj branches/2.1/contrib/win/vs2005/vtestcall.vcproj branches/2.1/lib/iaxclient_lib.c branches/2.1/simpleclient/iaxcomm/Makefile.am branches/2.1/simpleclient/iaxcomm/prefs.cc branches/2.1/simpleclient/vtestcall/Makefile.am Added Paths: ----------- branches/2.1/simpleclient/iaxcomm/iaxcomm.sln branches/2.1/simpleclient/iaxcomm/iaxcomm.vcproj Modified: branches/2.1/Makefile.am =================================================================== --- branches/2.1/Makefile.am 2008-04-07 15:55:54 UTC (rev 1398) +++ branches/2.1/Makefile.am 2008-04-07 16:01:53 UTC (rev 1399) @@ -12,6 +12,8 @@ README.VisualStudio \ autogen.sh \ contrib \ + doc \ + Doxyfile \ m4 dist-hook: Modified: branches/2.1/contrib/win/vs2005/iaxclient.sln =================================================================== --- branches/2.1/contrib/win/vs2005/iaxclient.sln 2008-04-07 15:55:54 UTC (rev 1398) +++ branches/2.1/contrib/win/vs2005/iaxclient.sln 2008-04-07 16:01:53 UTC (rev 1399) @@ -7,13 +7,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiaxclient", "libiaxclient.vcproj", "{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}" ProjectSection(ProjectDependencies) = postProject + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} + {3A76129B-55AB-4D54-BAA7-08F63ED52569} = {3A76129B-55AB-4D54-BAA7-08F63ED52569} {82C9BD79-9796-405F-8A28-3F538514AC3A} = {82C9BD79-9796-405F-8A28-3F538514AC3A} - {3A76129B-55AB-4D54-BAA7-08F63ED52569} = {3A76129B-55AB-4D54-BAA7-08F63ED52569} - {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} - {2F463562-375D-481E-A6E0-7C7D0DC1ED7A} = {2F463562-375D-481E-A6E0-7C7D0DC1ED7A} - {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4} {E2C6AD95-7A61-41FE-8754-A4623C891BF8} = {E2C6AD95-7A61-41FE-8754-A4623C891BF8} {F5166D99-32BB-40D5-BE95-6F97F72C44CE} = {F5166D99-32BB-40D5-BE95-6F97F72C44CE} + {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4} {3B023516-2C69-4CCB-9302-239991B6EC2C} = {3B023516-2C69-4CCB-9302-239991B6EC2C} EndProjectSection EndProject @@ -26,8 +25,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libspeex.vcproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora", "libtheora.vcproj", "{E2C6AD95-7A61-41FE-8754-A4623C891BF8}" + ProjectSection(ProjectDependencies) = postProject + {2F463562-375D-481E-A6E0-7C7D0DC1ED7A} = {2F463562-375D-481E-A6E0-7C7D0DC1ED7A} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testcall", "testcall.vcproj", "{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}" + ProjectSection(ProjectDependencies) = postProject + {9A9C003E-EAF6-4D0E-896F-E3994503C7E4} = {9A9C003E-EAF6-4D0E-896F-E3994503C7E4} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtestcall", "vtestcall.vcproj", "{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}" ProjectSection(ProjectDependencies) = postProject @@ -39,139 +44,173 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_dll|Win32 = Debug_dll|Win32 + Debug_novideo_dll|Win32 = Debug_novideo_dll|Win32 Debug_novideo|Win32 = Debug_novideo|Win32 Debug|Win32 = Debug|Win32 Release_dll|Win32 = Release_dll|Win32 + Release_novideo_dll|Win32 = Release_novideo_dll|Win32 Release_novideo|Win32 = Release_novideo|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_dll|Win32.ActiveCfg = Debug|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_dll|Win32.Build.0 = Debug|Win32 + {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32 + {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_novideo|Win32.ActiveCfg = Debug|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_novideo|Win32.Build.0 = Debug|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug|Win32.ActiveCfg = Debug|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug|Win32.Build.0 = Debug|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_dll|Win32.ActiveCfg = Release|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_dll|Win32.Build.0 = Release|Win32 + {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32 + {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_novideo_dll|Win32.Build.0 = Release|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_novideo|Win32.ActiveCfg = Release|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_novideo|Win32.Build.0 = Release|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release|Win32.ActiveCfg = Release|Win32 {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release|Win32.Build.0 = Release|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_dll|Win32.ActiveCfg = Debug|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_dll|Win32.Build.0 = Debug|Win32 + {3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32 + {3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_novideo|Win32.ActiveCfg = Debug|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_novideo|Win32.Build.0 = Debug|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug|Win32.ActiveCfg = Debug|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug|Win32.Build.0 = Debug|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_dll|Win32.ActiveCfg = Release|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_dll|Win32.Build.0 = Release|Win32 + {3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32 + {3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_novideo_dll|Win32.Build.0 = Release|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_novideo|Win32.ActiveCfg = Release|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_novideo|Win32.Build.0 = Release|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Release|Win32.ActiveCfg = Release|Win32 {3B023516-2C69-4CCB-9302-239991B6EC2C}.Release|Win32.Build.0 = Release|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_dll|Win32.Build.0 = Debug_dll|Win32 + {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_novideo_dll|Win32.ActiveCfg = Debug_novideo_dll|Win32 + {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_novideo_dll|Win32.Build.0 = Debug_novideo_dll|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_novideo|Win32.ActiveCfg = Debug_novideo|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_novideo|Win32.Build.0 = Debug_novideo|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug|Win32.ActiveCfg = Debug|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug|Win32.Build.0 = Debug|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_dll|Win32.ActiveCfg = Release_dll|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_dll|Win32.Build.0 = Release_dll|Win32 + {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_novideo_dll|Win32.ActiveCfg = Release_novideo_dll|Win32 + {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_novideo_dll|Win32.Build.0 = Release_novideo_dll|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_novideo|Win32.ActiveCfg = Release_novideo|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_novideo|Win32.Build.0 = Release_novideo|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release|Win32.ActiveCfg = Release|Win32 {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release|Win32.Build.0 = Release|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_dll|Win32.ActiveCfg = Debug|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_dll|Win32.Build.0 = Debug|Win32 + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32 + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_novideo|Win32.ActiveCfg = Debug|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_novideo|Win32.Build.0 = Debug|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.ActiveCfg = Debug|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.Build.0 = Debug|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_dll|Win32.ActiveCfg = Release|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_dll|Win32.Build.0 = Release|Win32 + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32 + {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_novideo_dll|Win32.Build.0 = Release|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_novideo|Win32.ActiveCfg = Release|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_novideo|Win32.Build.0 = Release|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.ActiveCfg = Release|Win32 {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.Build.0 = Release|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_dll|Win32.ActiveCfg = Debug|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_dll|Win32.Build.0 = Debug|Win32 + {82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32 + {82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_novideo|Win32.ActiveCfg = Debug|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_novideo|Win32.Build.0 = Debug|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug|Win32.ActiveCfg = Debug|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug|Win32.Build.0 = Debug|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_dll|Win32.ActiveCfg = Release|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_dll|Win32.Build.0 = Release|Win32 + {82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32 + {82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_novideo_dll|Win32.Build.0 = Release|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_novideo|Win32.ActiveCfg = Release|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_novideo|Win32.Build.0 = Release|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Release|Win32.ActiveCfg = Release|Win32 {82C9BD79-9796-405F-8A28-3F538514AC3A}.Release|Win32.Build.0 = Release|Win32 {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_dll|Win32.ActiveCfg = Debug|Win32 {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_dll|Win32.Build.0 = Debug|Win32 + {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32 {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_novideo|Win32.ActiveCfg = Debug|Win32 {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug|Win32.ActiveCfg = Debug|Win32 {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug|Win32.Build.0 = Debug|Win32 {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_dll|Win32.ActiveCfg = Release|Win32 {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_dll|Win32.Build.0 = Release|Win32 + {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32 {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_novideo|Win32.ActiveCfg = Release|Win32 {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release|Win32.ActiveCfg = Release|Win32 {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release|Win32.Build.0 = Release|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_dll|Win32.ActiveCfg = Debug|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_dll|Win32.Build.0 = Debug|Win32 + {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32 + {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_novideo|Win32.ActiveCfg = Debug|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_novideo|Win32.Build.0 = Debug|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.ActiveCfg = Debug|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.Build.0 = Debug|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_dll|Win32.ActiveCfg = Release|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_dll|Win32.Build.0 = Release|Win32 + {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32 + {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_novideo_dll|Win32.Build.0 = Release|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_novideo|Win32.ActiveCfg = Release|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_novideo|Win32.Build.0 = Release|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.ActiveCfg = Release|Win32 {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.Build.0 = Release|Win32 {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_dll|Win32.ActiveCfg = Debug|Win32 {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_dll|Win32.Build.0 = Debug|Win32 + {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32 {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_novideo|Win32.ActiveCfg = Debug|Win32 {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug|Win32.ActiveCfg = Debug|Win32 {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug|Win32.Build.0 = Debug|Win32 {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_dll|Win32.ActiveCfg = Release|Win32 {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_dll|Win32.Build.0 = Release|Win32 + {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32 {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_novideo|Win32.ActiveCfg = Release|Win32 {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release|Win32.ActiveCfg = Release|Win32 {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release|Win32.Build.0 = Release|Win32 - {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_dll|Win32.ActiveCfg = Debug|Win32 - {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_dll|Win32.Build.0 = Debug|Win32 + {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32 + {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_dll|Win32.Build.0 = Debug_dll|Win32 + {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_novideo_dll|Win32.ActiveCfg = Debug_novideo_dll|Win32 + {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_novideo_dll|Win32.Build.0 = Debug_novideo_dll|Win32 {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_novideo|Win32.ActiveCfg = Debug_novideo|Win32 {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_novideo|Win32.Build.0 = Debug_novideo|Win32 {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug|Win32.ActiveCfg = Debug|Win32 {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug|Win32.Build.0 = Debug|Win32 - {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_dll|Win32.ActiveCfg = Release|Win32 - {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_dll|Win32.Build.0 = Release|Win32 + {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_dll|Win32.ActiveCfg = Release_dll|Win32 + {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_dll|Win32.Build.0 = Release_dll|Win32 + {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo_dll|Win32.ActiveCfg = Release_novideo_dll|Win32 + {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo_dll|Win32.Build.0 = Release_novideo_dll|Win32 {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo|Win32.ActiveCfg = Release_novideo|Win32 {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|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|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 {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.Build.0 = Debug|Win32 + {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32 {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_novideo|Win32.ActiveCfg = Debug|Win32 - {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_novideo|Win32.Build.0 = Debug|Win32 {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug|Win32.ActiveCfg = Debug|Win32 {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug|Win32.Build.0 = Debug|Win32 {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_dll|Win32.ActiveCfg = Release|Win32 {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_dll|Win32.Build.0 = Release|Win32 + {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32 {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_novideo|Win32.ActiveCfg = Release|Win32 - {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_novideo|Win32.Build.0 = Release|Win32 {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release|Win32.ActiveCfg = Release|Win32 {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection Modified: branches/2.1/contrib/win/vs2005/libiaxclient.vcproj =================================================================== --- branches/2.1/contrib/win/vs2005/libiaxclient.vcproj 2008-04-07 15:55:54 UTC (rev 1398) +++ branches/2.1/contrib/win/vs2005/libiaxclient.vcproj 2008-04-07 16:01:53 UTC (rev 1399) @@ -16,7 +16,7 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(OutDir)" ConfigurationType="4" CharacterSet="2" @@ -80,7 +80,7 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(OutDir)" ConfigurationType="4" CharacterSet="2" @@ -143,7 +143,7 @@ </Configuration> <Configuration Name="Release_dll|Win32" - OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(OutDir)" ConfigurationType="2" CharacterSet="2" @@ -185,6 +185,7 @@ /> <Tool Name="VCLinkerTool" + LinkLibraryDependencies="false" AdditionalDependencies="libiax2.lib libvidcap.lib libportmixer.lib libportaudio.lib libgsm.lib libogg.lib libspeex.lib libtheora.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib" AdditionalLibraryDirectories=""$(SolutionDir)Release\libiax2";"$(SolutionDir)Release\libvidcap";"$(SolutionDir)Release\libportaudio";"$(SolutionDir)Release\libportmixer";"$(SolutionDir)Release\libogg";"$(SolutionDir)Release\libtheora";"$(SolutionDir)Release\libspeex";"$(SolutionDir)Release\libgsm"" /> @@ -215,8 +216,8 @@ </Configuration> <Configuration Name="Debug_dll|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(OutDir)" ConfigurationType="2" CharacterSet="2" > @@ -258,6 +259,7 @@ /> <Tool Name="VCLinkerTool" + LinkLibraryDependencies="false" AdditionalDependencies="libiax2.lib libvidcap.lib libportmixer.lib libportaudio.lib libgsm.lib libogg.lib libspeex.lib libtheora.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib" AdditionalLibraryDirectories=""$(SolutionDir)Debug\libiax2";"$(SolutionDir)Debug\libvidcap";"$(SolutionDir)Debug\libportaudio";"$(SolutionDir)Debug\libportmixer";"$(SolutionDir)Debug\libogg";"$(SolutionDir)Debug\libtheora";"$(SolutionDir)Debug\libspeex";"$(SolutionDir)Debug\libgsm"" /> @@ -288,7 +290,7 @@ </Configuration> <Configuration Name="Release_novideo|Win32" - OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(OutDir)" ConfigurationType="4" CharacterSet="2" @@ -351,7 +353,7 @@ </Configuration> <Configuration Name="Debug_novideo|Win32" - OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(OutDir)" ConfigurationType="4" CharacterSet="2" @@ -413,6 +415,153 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Release_novideo_dll|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="2" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\lib\portmixer\px_common" + PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;CODEC_GSM" + RuntimeLibrary="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + 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"" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_novideo_dll|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="2" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\lib\portmixer\px_common" + PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;CODEC_GSM" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + 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)Debug\libiax2";"$(SolutionDir)Debug\libportaudio";"$(SolutionDir)Debug\libportmixer";"$(SolutionDir)Debug\libspeex";"$(SolutionDir)Debug\libgsm"" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> @@ -461,6 +610,22 @@ Name="VCCLCompilerTool" /> </FileConfiguration> + <FileConfiguration + Name="Release_novideo_dll|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_novideo_dll|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> <File RelativePath="..\..\..\lib\codec_ulaw.c" @@ -521,6 +686,22 @@ CompileAs="2" /> </FileConfiguration> + <FileConfiguration + Name="Release_novideo_dll|Win32" + > + <Tool + Name="VCCLCompilerTool" + CompileAs="2" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_novideo_dll|Win32" + > + <Tool + Name="VCCLCompilerTool" + CompileAs="2" + /> + </FileConfiguration> </File> <File RelativePath="..\..\..\lib\ringbuffer.c" @@ -549,6 +730,22 @@ Name="VCCLCompilerTool" /> </FileConfiguration> + <FileConfiguration + Name="Release_novideo_dll|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_novideo_dll|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> <File RelativePath="..\..\..\lib\winfuncs.c" @@ -611,6 +808,22 @@ Name="VCCustomBuildTool" /> </FileConfiguration> + <FileConfiguration + Name="Release_novideo_dll|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_novideo_dll|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> <File RelativePath="..\..\..\lib\codec_ulaw.h" @@ -651,6 +864,22 @@ Name="VCCustomBuildTool" /> </FileConfiguration> + <FileConfiguration + Name="Release_novideo_dll|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_novideo_dll|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> </Filter> <Filter Modified: branches/2.1/contrib/win/vs2005/testcall.vcproj =================================================================== --- branches/2.1/contrib/win/vs2005/testcall.vcproj 2008-04-07 15:55:54 UTC (rev 1398) +++ branches/2.1/contrib/win/vs2005/testcall.vcproj 2008-04-07 16:01:53 UTC (rev 1399) @@ -61,6 +61,7 @@ /> <Tool Name="VCLinkerTool" + LinkLibraryDependencies="false" AdditionalDependencies="libiaxclient.lib ws2_32.lib" LinkIncremental="2" AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient" @@ -139,6 +140,7 @@ <Tool Name="VCLinkerTool" IgnoreImportLibrary="false" + LinkLibraryDependencies="false" AdditionalDependencies="libiaxclient.lib ws2_32.lib" LinkIncremental="1" AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient" @@ -176,8 +178,8 @@ </Configuration> <Configuration Name="Release_novideo|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(OutDir)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1" @@ -219,6 +221,7 @@ <Tool Name="VCLinkerTool" IgnoreImportLibrary="false" + LinkLibraryDependencies="false" AdditionalDependencies="libiaxclient.lib ws2_32.lib" LinkIncremental="1" AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient" @@ -256,8 +259,8 @@ </Configuration> <Configuration Name="Debug_novideo|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)" + IntermediateDirectory="$(OutDir)" ConfigurationType="1" CharacterSet="2" > @@ -300,6 +303,7 @@ /> <Tool Name="VCLinkerTool" + LinkLibraryDependencies="false" AdditionalDependencies="libiaxclient.lib ws2_32.lib" LinkIncremental="2" AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient" @@ -333,6 +337,332 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Release_novideo_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" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + IgnoreImportLibrary="false" + LinkLibraryDependencies="false" + AdditionalDependencies="libiaxclient.lib ws2_32.lib" + LinkIncremental="1" + AdditionalLibraryDirectories="$(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> + <Configuration + Name="Debug_novideo_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" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkLibraryDependencies="false" + AdditionalDependencies="libiaxclient.lib ws2_32.lib" + LinkIncremental="2" + AdditionalLibraryDirectories="$(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" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + IgnoreImportLibrary="false" + LinkLibraryDependencies="false" + AdditionalDependencies="libiaxclient.lib ws2_32.lib" + LinkIncremental="1" + AdditionalLibraryDirectories="$(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> + <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" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + CompileAs="1" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkLibraryDependencies="false" + AdditionalDependencies="libiaxclient.lib ws2_32.lib" + LinkIncremental="2" + AdditionalLibraryDirectories="$(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> </Configurations> <References> </References> Modified: branches/2.1/contrib/win/vs2005/vtestcall.vcproj =================================================================== --- branches/2.1/contrib/win/vs2005/vtestcall.vcproj 2008-04-07 15:55:54 UTC (rev 1398) +++ branches/2.1/contrib/win/vs2005/vtestcall.vcproj 2008-04-07 16:01:53 UTC (rev 1399) @@ -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> Modified: branches/2.1/lib/iaxclient_lib.c =================================================================== --- branches/2.1/lib/iaxclient_lib.c 2008-04-07 15:55:54 UTC (rev 1398) +++ branches/2.1/lib/iaxclient_lib.c 2008-04-07 16:01:53 UTC (rev 1399) @@ -1910,13 +1910,14 @@ return audio_driver.mic_boost_set( &audio_driver, enable ) ; } -#ifdef LIBVER EXPORT char* iaxc_version(char * ver) { +#ifndef LIBVER +#define LIBVER "" +#endif strncpy(ver, LIBVER, IAXC_EVENT_BUFSIZ); return ver; } -#endif EXPORT unsigned int iaxc_get_audio_prefs(void) { Modified: branches/2.1/simpleclient/iaxcomm/Makefile.am =================================================================== --- branches/2.1/simpleclient/iaxcomm/Makefile.am 2008-04-07 15:55:54 UTC (rev 1398) +++ branches/2.1/simpleclient/iaxcomm/Makefile.am 2008-04-07 16:01:53 UTC (rev 1399) @@ -85,4 +85,4 @@ endif MACOSX -EXTRA_DIST = QUICKSTART ring.raw iaxcomm.icns +EXTRA_DIST = QUICKSTART ring.raw iaxcomm.icns iaxcomm.sln iaxcomm.vcproj Copied: branches/2.1/simpleclient/iaxcomm/iaxcomm.sln (from rev 1397, trunk/simpleclient/iaxcomm/iaxcomm.sln) =================================================================== --- branches/2.1/simpleclient/iaxcomm/iaxcomm.sln (rev 0) +++ branches/2.1/simpleclient/iaxcomm/iaxcomm.sln 2008-04-07 16:01:53 UTC (rev 1399) @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iaxcomm", "iaxcomm.vcproj", "{3856417E-2A25-4094-A7E2-38AE64719ECA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_dll|Win32 = Debug_dll|Win32 + Debug_novideo_dll|Win32 = Debug_novideo_dll|Win32 + Debug_novideo|Win32 = Debug_novideo|Win32 + Debug|Win32 = Debug|Win32 + Release_dll|Win32 = Release_dll|Win32 + Release_novideo_dll|Win32 = Release_novideo_dll|Win32 + Release_novideo|Win32 = Release_novideo|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_dll|Win32.Build.0 = Debug_dll|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_novideo_dll|Win32.ActiveCfg = Debug_novideo_dll|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_novideo_dll|Win32.Build.0 = Debug_novideo_dll|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_novideo|Win32.ActiveCfg = Debug_novideo|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_novideo|Win32.Build.0 = Debug_novideo|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug|Win32.ActiveCfg = Debug|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug|Win32.Build.0 = Debug|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_dll|Win32.ActiveCfg = Release_dll|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_dll|Win32.Build.0 = Release_dll|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_novideo_dll|Win32.ActiveCfg = Release_novideo_dll|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_novideo_dll|Win32.Build.0 = Release_novideo_dll|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_novideo|Win32.ActiveCfg = Release_novideo|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_novideo|Win32.Build.0 = Release_novideo|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release|Win32.ActiveCfg = Release|Win32 + {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Copied: branches/2.1/simpleclient/iaxcomm/iaxcomm.vcproj (from rev 1397, trunk/simpleclient/iaxcomm/iaxcomm.vcproj) =================================================================== --- branches/2.1/simpleclient/iaxcomm/iaxcomm.vcproj (rev 0) +++ branches/2.1/simpleclient/iaxcomm/iaxcomm.vcproj 2008-04-07 16:01:53 UTC (rev 1399) @@ -0,0 +1,754 @@ +<?xml version="1.0" encoding="UTF-8"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="iaxcomm" + ProjectGUID="{3856417E-2A25-4094-A7E2-38AE64719ECA}" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient" + GenerateDebugInformation="true" + SubSystem="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" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + AssemblerOutput="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient" + GenerateDebugInformation="true" + SubSystem="2" + 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" + /> + </Configuration> + <Configuration + Name="Debug_dll|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient" + GenerateDebugInformation="true" + SubSystem="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 ..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)" + /> + </Configuration> + <Configuration + Name="Release_dll|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + AssemblerOutput="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient" + GenerateDebugInformation="true" + SubSystem="2" + 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 ..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)" + /> + </Configuration> + <Configuration + Name="Release_novideo|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + AssemblerOutput="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient" + GenerateDebugInformation="true" + SubSystem="2" + 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" + /> + </Configuration> + <Configuration + Name="Release_novideo_dll|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + AssemblerOutput="2" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient" + GenerateDebugInformation="true" + SubSystem="2" + 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 ..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)" + /> + </Configuration> + <Configuration + Name="Debug_novideo|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(OutDir)" + ConfigurationType="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc"" + PreprocessorDefinitions="XRCDIRECTORY=\"..\\r... [truncated message content] |