[Iaxclient-cvs] SF.net SVN: iaxclient: [1085] trunk/contrib/win/vs2005

[<jpg...@us...>]

Revision: 1085
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1085&view=rev
Author:   jpgrayson
Date:     2007-08-15 11:17:38 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
Fix libportaudio.vcproj to help build pa_ringbuffer.c
Fix libiaxclient.vcproj to have the correct include path for portmixer.h.

Modified Paths:
--------------
    trunk/contrib/win/vs2005/libiaxclient.vcproj
    trunk/contrib/win/vs2005/libportaudio.vcproj

Modified: trunk/contrib/win/vs2005/libiaxclient.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libiaxclient.vcproj	2007-08-15 17:36:35 UTC (rev 1084)
+++ trunk/contrib/win/vs2005/libiaxclient.vcproj	2007-08-15 18:17:38 UTC (rev 1085)
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include"
+				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include;..\..\..\lib\portmixer\px_common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -101,7 +101,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include"
+				AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\..\libogg\include;..\..\..\..\libtheora\include;..\..\..\lib\portmixer\px_common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;BUILDING_DLL;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -179,10 +179,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\lib\ringbuffer.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\lib\spandsp\plc.c"
 				>
 				<FileConfiguration
@@ -203,6 +199,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\..\lib\ringbuffer.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\lib\video.c"
 				>
 			</File>

Modified: trunk/contrib/win/vs2005/libportaudio.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libportaudio.vcproj	2007-08-15 17:36:35 UTC (rev 1084)
+++ trunk/contrib/win/vs2005/libportaudio.vcproj	2007-08-15 18:17:38 UTC (rev 1085)
@@ -39,7 +39,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\portaudio\include;..\..\..\..\portaudio\src\common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;ALLOW_SMP_DANGERS=1"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"
@@ -101,7 +101,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\..\portaudio\include;..\..\..\..\portaudio\src\common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PA_NO_DS;PA_NO_ASIO;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;ALLOW_SMP_DANGERS=1"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -235,10 +235,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\portaudio\src\common\pa_ringbuffer.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\..\portaudio\include\pa_linux_alsa.h"
 				>
 			</File>
@@ -251,6 +247,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\..\portaudio\src\common\pa_ringbuffer.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\portaudio\src\common\pa_stream.h"
 				>
 			</File>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.