Thread: [Iaxclient-cvs] SF.net SVN: iaxclient: [1352] branches/2.1

Status: Beta

Brought to you by: jpgrayson, sbalea, stevek

iaxclient-cvs

[Iaxclient-cvs] SF.net SVN: iaxclient: [1352] branches/2.1

From: <sb...@us...> - 2008-02-26 19:36:06

Revision: 1352
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1352&view=rev
Author:   sbalea
Date:     2008-02-26 11:36:11 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
Remove incorrect references to videoLib and stresstest.vcproj from Makefile.am

Modified Paths:
--------------
    branches/2.1/lib/Makefile.am
    branches/2.1/simpleclient/stresstest/Makefile.am

Modified: branches/2.1/lib/Makefile.am
===================================================================
--- branches/2.1/lib/Makefile.am	2008-02-26 19:21:04 UTC (rev 1351)
+++ branches/2.1/lib/Makefile.am	2008-02-26 19:36:11 UTC (rev 1352)
@@ -211,6 +211,5 @@
 	portmixer				\
 	sox					\
 	spandsp					\
-	videoLib				\
 	wince
 

Modified: branches/2.1/simpleclient/stresstest/Makefile.am
===================================================================
--- branches/2.1/simpleclient/stresstest/Makefile.am	2008-02-26 19:21:04 UTC (rev 1351)
+++ branches/2.1/simpleclient/stresstest/Makefile.am	2008-02-26 19:36:11 UTC (rev 1352)
@@ -14,4 +14,3 @@
 		-framework QuickTime
 endif
 
-EXTRA_DIST = stresstest.vcproj


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

[Iaxclient-cvs] SF.net SVN: iaxclient: [1366] branches/2.1

From: <jpg...@us...> - 2008-02-29 18:19:41

Revision: 1366
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1366&view=rev
Author:   jpgrayson
Date:     2008-02-29 10:19:47 -0800 (Fri, 29 Feb 2008)

Log Message:
-----------
Merge configure changes from iaxclient trunk revisions 1357:1365 into 2.1 branch.
This changes the --with-video configure option to --enable-video (or --disable-video).
Also, --disable-vidcap is implied by --disable-video.

Modified Paths:
--------------
    branches/2.1/configure.ac
    branches/2.1/contrib/macosx/Prefixes.h
    branches/2.1/contrib/tcl/Prefixes.h
    branches/2.1/contrib/win/vs2003/iaxclient_dll.vcproj
    branches/2.1/contrib/win/vs2003/iaxclient_lib.vcproj
    branches/2.1/simpleclient/vtestcall/vtestcall.vcproj

Modified: branches/2.1/configure.ac
===================================================================
--- branches/2.1/configure.ac	2008-02-29 18:16:07 UTC (rev 1365)
+++ branches/2.1/configure.ac	2008-02-29 18:19:47 UTC (rev 1366)
@@ -5,7 +5,7 @@
 dnl Package version
 m4_define(IAXC_VERSION, [2.1-svn])
 
-AC_INIT(iaxclient, IAXC_VERSION, [jpg...@gm...])
+AC_INIT(iaxclient, IAXC_VERSION, [iax...@li...])
 
 AC_CONFIG_SRCDIR([lib/iaxclient.h])
 AC_CONFIG_HEADERS([config.h])
@@ -66,7 +66,6 @@
 CFLAGS=${CFLAGS-"-O2 -g -Wall --std=gnu99"}
 CXXFLAGS=${CXXFLAGS-"-O2 -g -Wall"}
 
-# AC_ARG_ENABLE saves the option's argument in enable_FEATURE
 AC_ARG_ENABLE(local-gsm,
       [AS_HELP_STRING([--enable-local-gsm],
          [Use local gsm library [default=auto]])],,
@@ -83,14 +82,14 @@
 				 enable_debug_iax2=$enableval,
  				 enable_debug_iax2="no")
 
-AC_ARG_ENABLE(speex_preprocess,
-      [AS_HELP_STRING([--disable-speex-preprocess],
-         [Turn off speex preprocessing])],,
-      [enable_speex_preprocess="yes"])
+AC_ARG_ENABLE(video,
+      [AS_HELP_STRING([--enable-video],
+         [Enable video support [default=yes]])],,
+      [enable_video="yes"])
 
 AC_ARG_WITH(echo-can,
       [AS_HELP_STRING([--with-echo-can],
-         [use echo can (span, speex or mec2) [default=speex]])],
+         [use echo can (span or speex) [default=speex]])],
       use_echo_can=$withval,
       use_echo_can="speex")
 
@@ -104,35 +103,12 @@
          [Enable iLBC support (You need to place the iLBC reference sources in lib/iLBC) [default=auto]])],,
       with_ilbc="auto")
 
-case "$with_ilbc" in
-   yes)
-      enable_local_ilbc=yes ;;
-   no)
-      enable_local_ilbc=no ;;
-   auto)
-      AC_MSG_CHECKING([for iLBC reference sources in lib/iLBC])
-      if test -r lib/iLBC/iLBC_encode.c; then
-         enable_local_ilbc=yes
-      else
-         enable_local_ilbc=no
-      fi
-      AC_MSG_RESULT([$enable_local_ilbc]) ;;
-
-   *)
-      AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;;
-esac
-
 AC_ARG_WITH(wish,
       [AS_HELP_STRING([--with-wish],
          [Path to Tcl command language interpreter])],
       WISH="${with_wish}",
       with_wish="auto")
 
-AC_ARG_WITH(video,
-      [AS_HELP_STRING([--without-video],
-         [Video support])],,
-      with_video="yes")
-
 AC_ARG_WITH(ogg,
       [AS_HELP_STRING([--without-ogg],
          [OGG support])],,
@@ -154,24 +130,23 @@
       FFMPEG="${with_ffmpeg}",
       with_ffmpeg="no")
 
-if test ! "x$enable_clients" = "xauto"; then
-   for client in ${enable_clients}; do
-      case "$client" in
-         iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx)
-            clients="$clients $client" ;;
-         all | yes)
-            clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx"
-            break ;;
-         none | no)
-            clients=""
-            break ;;
-         *)
-            AC_MSG_ERROR(bad value ${client} for --enable-clients) ;;
-      esac
-   done
-fi
+case "$with_ilbc" in
+   yes)
+      enable_local_ilbc=yes ;;
+   no)
+      enable_local_ilbc=no ;;
+   auto)
+      AC_MSG_CHECKING([for iLBC reference sources in lib/iLBC])
+      if test -r lib/iLBC/iLBC_encode.c; then
+         enable_local_ilbc=yes
+      else
+         enable_local_ilbc=no
+      fi
+      AC_MSG_RESULT([$enable_local_ilbc]) ;;
 
-AM_OPTIONS_WXCONFIG
+   *)
+      AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;;
+esac
 
 case $host_os in
    *mingw32*|*cygwin* )
@@ -200,35 +175,6 @@
    obtain a copy.
 ]))
 
-has_gsm=no
-if test x$enable_local_gsm = xyes; then
-   has_gsm=yes
-   GSM_CFLAGS='-I$(top_srcdir)/lib/gsm/inc'
-else
-   AM_PATH_GSM(has_gsm=yes, has_gsm=no)
-fi
-
-if test x$with_video = xyes; then
-   AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable Video support])
-fi
-AM_CONDITIONAL(VIDEO, test x$with_video = xyes)
-
-has_ogg=no
-if test ! x$with_ogg = xno; then
-PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3],has_ogg=yes)
-if test x$has_ogg = xyes; then
-   AC_DEFINE(USE_OGG, 1, [OGG])
-   PKG_REQUIRES="$PKG_REQUIRES ogg"
-elif test ! x$with_ogg = xauto ; then
-   AC_MSG_ERROR([
-      libogg is required to build this package!
-      please see http://www.xiph.org/ for how to
-      obtain a copy.
-   ])
-fi
-fi
-AM_CONDITIONAL(OGG, test x$has_ogg = xyes)
-  
 PKG_CHECK_MODULES(SPEEX, [speex >= 1.2],,AC_MSG_ERROR([
    speex is required to build this package!
    please see http://www.xiph.org/ for how to
@@ -241,66 +187,85 @@
    obtain a copy.
 ]))
 
-has_theora=no
-if test ! x$with_theora = xno; then
-PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7],has_theora=yes)
-if test x$has_theora = xyes; then
-   AC_DEFINE(USE_THEORA, 1, [THEORA])
-   PKG_REQUIRES="$PKG_REQUIRES theora"
-elif test ! x$with_theora = xauto ; then
-   AC_MSG_ERROR([
-      libtheora is required to build this package!
-      please see http://www.xiph.org/ for how to
-      obtain a copy.
-   ])
-fi
-fi
-AM_CONDITIONAL(THEORA, test x$has_theora = xyes)
-
-has_vidcap=no
-if test ! x$with_vidcap = xno; then
-   PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1],has_vidcap=yes)
-   if test x$has_vidcap = xyes; then
-      AC_DEFINE(USE_VIDCAP, 1, [VIDCAP])
-      PKG_REQUIRES="$PKG_REQUIRES vidcap"
-   elif test ! x$with_vidcap = xauto ; then
-      AC_MSG_ERROR([
-         libvidcap is required to build this package!
-         please see http://libvidcap.sourceforge.net/ for how to
-         obtain a copy.
-      ])
-   fi
-fi
-AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes)
-
-has_ffmpeg=no
-if test ! x$with_ffmpeg = xno; then
-PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3],has_ffmpeg=yes)
-if test x$has_ffmpeg = xyes; then
-   AC_DEFINE(USE_FFMPEG, 1, [FFMPEG])
-   PKG_REQUIRES="$PKG_REQUIRES ffmpeg"
-elif test ! x$with_ffmpeg = xauto ; then
-   AC_MSG_ERROR([
-      FFmpeg is required to build this package!
-      please see http://ffmpeg.mplayerhq.hu/ for how to
-      obtain a copy.
-   ])
-fi
-fi
-AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes)
-
 PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no)
 PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no)
 PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no)
 PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no)
+PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3], has_ogg=yes, has_ogg=no)
 PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no)
+PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7], has_theora=yes, has_theora=no)
+PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1], has_vidcap=yes, has_vidcap=no)
+PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3], has_ffmpeg=yes, has_ffmpeg=no)
 
+has_gsm=no
+if test x$enable_local_gsm = xyes; then
+   has_gsm=yes
+   GSM_CFLAGS='-I$(top_srcdir)/lib/gsm/inc'
+else
+   AM_PATH_GSM(has_gsm=yes, has_gsm=no)
+fi
+
+if test x$enable_video = xyes; then
+
+   if test x$with_ogg != xno; then
+      if test x$has_ogg = xyes; then
+         AC_DEFINE(USE_OGG, 1, [OGG])
+         PKG_REQUIRES="$PKG_REQUIRES ogg"
+      elif test x$with_ogg != xauto ; then
+         AC_MSG_ERROR([
+            libogg is required to build this package!
+            please see http://www.xiph.org/ for how to
+            obtain a copy.
+         ])
+      fi
+   fi
+     
+   if test x$with_theora != xno; then
+      if test x$has_theora = xyes; then
+         AC_DEFINE(USE_THEORA, 1, [THEORA])
+         PKG_REQUIRES="$PKG_REQUIRES theora"
+      elif test x$with_theora != xauto ; then
+         AC_MSG_ERROR([
+            libtheora is required to build this package!
+            please see http://www.xiph.org/ for how to
+            obtain a copy.
+         ])
+      fi
+   fi
+   
+   if test x$with_vidcap != xno; then
+      if test x$has_vidcap = xyes; then
+         AC_DEFINE(USE_VIDCAP, 1, [VIDCAP])
+         PKG_REQUIRES="$PKG_REQUIRES vidcap"
+      elif test x$with_vidcap != xauto ; then
+         AC_MSG_ERROR([
+            libvidcap is required to build this package!
+            please see http://libvidcap.sourceforge.net/ for how to
+            obtain a copy.
+         ])
+      fi
+   fi
+   
+   if test x$with_ffmpeg != xno; then
+      if test x$has_ffmpeg = xyes; then
+         AC_DEFINE(USE_FFMPEG, 1, [FFMPEG])
+         PKG_REQUIRES="$PKG_REQUIRES ffmpeg"
+      elif test x$with_ffmpeg != xauto ; then
+         AC_MSG_ERROR([
+            FFmpeg is required to build this package!
+            please see http://ffmpeg.mplayerhq.hu/ for how to
+            obtain a copy.
+         ])
+      fi
+   fi
+fi
+
 has_iax2=no
-if test ! x$enable_local_iax = xyes; then
+if test x$enable_local_iax != xyes; then
    AM_PATH_IAX2(0.2.3,has_iax2=yes,has_iax2=no)
 fi
 
-if test x$has_iax2 = xno && test ! x$enable_local_iax = xno; then
+if test x$has_iax2 = xno && test x$enable_local_iax != xno; then
    has_iax2=yes
    enable_local_iax2=yes
    IAX2_CFLAGS='-I$(top_srcdir)/lib/libiax2/src -DLIBIAX'
@@ -308,6 +273,8 @@
    IAX2_CONFIG=""
 fi
 
+AM_OPTIONS_WXCONFIG
+
 has_wx="no"
 AM_PATH_WXCONFIG(2.6.0, [has_wx="2.6"],
       [AM_PATH_WXCONFIG(2.4.0, [has_wx="2.4"])])
@@ -322,7 +289,7 @@
 CXXFLAGS="$WX_CXXFLAGS_ONLY"
 
 AC_LANG_PUSH(C++)
-if test ! x$has_wx = xno; then
+if test x$has_wx != xno; then
    AC_CHECK_HEADER(wx/xrc/xmlres.h,has_wx_xrc=yes,
          [AC_MSG_WARN([Can't find wx/xrc/xml.h])
          has_wx_xrc=no])
@@ -364,32 +331,33 @@
 CXXFLAGS="$save_CXXFLAGS"
 dnl End wx xrc check
 
-if test x$enable_speex_preprocess = xyes; then
-   AC_DEFINE(SPEEX_PREPROCESS, 1, [Speex preprocess])
+if test x$enable_video = xyes; then
+   AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable video support])
 fi
 
-AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan)
 if test x$use_echo_can = xspan; then
-   AC_DEFINE(SPAN_EC, 1, [Span echo can])
+   AC_DEFINE(SPAN_EC, 1, [Define to 1 to enable span echo cancellation])
 fi
 
 if test x$use_echo_can = xspeex; then
-   AC_DEFINE(SPEEX_EC, 1, [Speex echo can])
+   AC_DEFINE(SPEEX_EC, 1, [Define to 1 to enable speex echo cancellation])
 fi
 
-if test x$use_echo_can = xmec2; then
-   AC_DEFINE(MEC2_EC, 1, [Mec echo can])
-fi
-
 if test x$enable_local_ilbc = xyes; then
-   AC_DEFINE(CODEC_ILBC,,[Enable ILBC support])
+   AC_DEFINE(CODEC_ILBC,,[Define to 1 to enable ILBC support])
 fi
 
-if test x$has_gsm = xyes && test ! x$with_gsm = xno; then
-   AC_DEFINE(CODEC_GSM,,[Enable GSM support])
+if test x$has_gsm = xyes && test x$with_gsm != xno; then
+   AC_DEFINE(CODEC_GSM,,[Define to 1 to enable GSM support])
 fi
 
-AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test ! x$with_gsm = xno)
+AM_CONDITIONAL(VIDEO, test x$enable_video = xyes)
+AM_CONDITIONAL(OGG, test x$has_ogg = xyes)
+AM_CONDITIONAL(THEORA, test x$has_theora = xyes)
+AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes)
+AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes)
+AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan)
+AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test x$with_gsm != xno)
 AM_CONDITIONAL(USE_LOCAL_GSM, test x$enable_local_gsm = xyes)
 AM_CONDITIONAL(USE_LOCAL_IAX2, test x$enable_local_iax2 = xyes)
 AM_CONDITIONAL(USE_DEBUG_IAX2, test x$enable_debug_iax2 = xyes)
@@ -399,14 +367,29 @@
 AM_CONDITIONAL(MACOSX, test x$OSTYPE = xMACOSX)
 
 # Autodetect clients
-if test "x$enable_clients" = "xauto"; then
+if test "x$enable_clients" != "xauto"; then
+   for client in ${enable_clients}; do
+      case "$client" in
+         iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx)
+            clients="$clients $client" ;;
+         all | yes)
+            clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx"
+            break ;;
+         none | no)
+            clients=""
+            break ;;
+         *)
+            AC_MSG_ERROR(bad value ${client} for --enable-clients) ;;
+      esac
+   done
+else
    clients="$clients testcall"
 
-   if test x$has_oggz = xyes && test x$has_theora = xyes; then
+   if test x$enable_video = xyes && test x$has_oggz = xyes && test x$has_theora = xyes; then
       clients="$clients stresstest"
    fi
 
-   if test ! x$has_wx = xno; then
+   if test x$has_wx != xno; then
       clients="$clients iaxphone"
       if test "x$has_gdk2" = xyes; then
          clients="$clients wx"
@@ -417,7 +400,7 @@
       fi
    fi
 
-   if test x$has_sdl = xyes && test x$with_video = xyes; then
+   if test x$has_sdl = xyes && test x$enable_video = xyes; then
       clients="$clients vtestcall"
    fi
 
@@ -425,7 +408,7 @@
       clients="$clients WinIAX"
    fi
 
-   if test ! x$WISH = x && test "x$has_gdk2" = "xyes"; then
+   if test x$WISH != x && test "x$has_gdk2" = "xyes"; then
       clients="$clients tkphone"
    fi
 fi
@@ -440,7 +423,7 @@
          CLIENTS="$CLIENTS $client";;
 
       vtestcall)
-         if test ! x$has_sdl = xyes || test ! x$with_video = xyes ; then
+         if test x$has_sdl != xyes || test x$enable_video != xyes ; then
             AC_MSG_ERROR([vtestcall requires SDL and video])
          fi
          CLIENTS="$CLIENTS $client";;

Modified: branches/2.1/contrib/macosx/Prefixes.h
===================================================================
--- branches/2.1/contrib/macosx/Prefixes.h	2008-02-29 18:16:07 UTC (rev 1365)
+++ branches/2.1/contrib/macosx/Prefixes.h	2008-02-29 18:19:47 UTC (rev 1366)
@@ -3,10 +3,8 @@
 #define LIBIAX 
 
 //#define CODEC_ILBC 0
-#define SPEEX_PREPROCESS 1
 //#define SPAN_EC 0
 #define SPEEX_EC 1
-//#define MEC2_EC 0
 
 
 

Modified: branches/2.1/contrib/tcl/Prefixes.h
===================================================================
--- branches/2.1/contrib/tcl/Prefixes.h	2008-02-29 18:16:07 UTC (rev 1365)
+++ branches/2.1/contrib/tcl/Prefixes.h	2008-02-29 18:19:47 UTC (rev 1366)
@@ -5,10 +5,8 @@
 
 
 //#define CODEC_ILBC 0
-#define SPEEX_PREPROCESS 1
 //#define SPAN_EC 0
 #define SPEEX_EC 1
-//#define MEC2_EC 0
 #define USE_NEWJB 1
 //#define USE_VIDEO 0
 

Modified: branches/2.1/contrib/win/vs2003/iaxclient_dll.vcproj
===================================================================
--- branches/2.1/contrib/win/vs2003/iaxclient_dll.vcproj	2008-02-29 18:16:07 UTC (rev 1365)
+++ branches/2.1/contrib/win/vs2003/iaxclient_dll.vcproj	2008-02-29 18:19:47 UTC (rev 1366)
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..,..\..\gsm\inc,..\..\portaudio\include,..\..\portaudio\src\common,..\..\portaudio\pablio,..\..\portmixer\px_common,..\..\libspeex\include,..\..\libiax2\src,..\..\wince"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_USRDLL;BUILDING_DLL;PA_NO_DS;PA_NO_ASIO;SPEEX_PREPROCESS=1;NEWJB;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;inline=__inline;strncasecmp=_strnicmp;vsnprintf=_vsnprintf"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_USRDLL;BUILDING_DLL;PA_NO_DS;PA_NO_ASIO;NEWJB;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;inline=__inline;strncasecmp=_strnicmp;vsnprintf=_vsnprintf"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -99,7 +99,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="..\..,..\..\gsm\inc,..\..\portaudio\include,..\..\portaudio\src\common,..\..\portaudio\pablio,..\..\portmixer\px_common,..\..\libspeex\include,..\..\libiax2\src,..\..\wince"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_USRDLL;BUILDING_DLL;PA_NO_DS;PA_NO_ASIO;SPEEX_PREPROCESS=1;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_USRDLL;BUILDING_DLL;PA_NO_DS;PA_NO_ASIO;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="FALSE"

Modified: branches/2.1/contrib/win/vs2003/iaxclient_lib.vcproj
===================================================================
--- branches/2.1/contrib/win/vs2003/iaxclient_lib.vcproj	2008-02-29 18:16:07 UTC (rev 1365)
+++ branches/2.1/contrib/win/vs2003/iaxclient_lib.vcproj	2008-02-29 18:19:47 UTC (rev 1366)
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..,..\..\gsm\inc,..\..\portaudio\include,..\..\portaudio\src\common,..\..\portaudio\pablio,..\..\portmixer\px_common,..\..\libspeex\include,..\..\libiax2\src,..\..\wince"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB;PA_NO_DS;PA_NO_ASIO;SPEEX_PREPROCESS=1;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB;PA_NO_DS;PA_NO_ASIO;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -81,7 +81,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="..\..,..\..\gsm\inc,..\..\portaudio\include,..\..\portaudio\src\common,..\..\portaudio\pablio,..\..\portmixer\px_common,..\..\libspeex\include,..\..\libiax2\src,..\..\wince"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LIB;PA_NO_DS;PA_NO_ASIO;SPEEX_PREPROCESS=1;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LIB;PA_NO_DS;PA_NO_ASIO;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="FALSE"

Modified: branches/2.1/simpleclient/vtestcall/vtestcall.vcproj
===================================================================
--- branches/2.1/simpleclient/vtestcall/vtestcall.vcproj	2008-02-29 18:16:07 UTC (rev 1365)
+++ branches/2.1/simpleclient/vtestcall/vtestcall.vcproj	2008-02-29 18:19:47 UTC (rev 1366)
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\lib\portaudio\pa_common;..\..\lib\speex\libspeex;&quot;.. \..\lib\portaudio\pablio&quot;;..\..\lib;..\..\lib\SDL\include;&quot;$(SDL_DIR)\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;SPEEX_PREPROCESS=1;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -130,7 +130,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\lib\portaudio\pa_common;..\..\lib\speex\libspeex;&quot;.. \..\lib\portaudio\pablio&quot;;..\..\lib;..\..\lib\SDL\include;&quot;$(SDL_DIR)\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;SPEEX_PREPROCESS=1;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="2"


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

[Iaxclient-cvs] SF.net SVN: iaxclient: [1399] branches/2.1

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="&quot;$(SolutionDir)Release\libiax2&quot;;&quot;$(SolutionDir)Release\libvidcap&quot;;&quot;$(SolutionDir)Release\libportaudio&quot;;&quot;$(SolutionDir)Release\libportmixer&quot;;&quot;$(SolutionDir)Release\libogg&quot;;&quot;$(SolutionDir)Release\libtheora&quot;;&quot;$(SolutionDir)Release\libspeex&quot;;&quot;$(SolutionDir)Release\libgsm&quot;"
 			/>
@@ -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="&quot;$(SolutionDir)Debug\libiax2&quot;;&quot;$(SolutionDir)Debug\libvidcap&quot;;&quot;$(SolutionDir)Debug\libportaudio&quot;;&quot;$(SolutionDir)Debug\libportmixer&quot;;&quot;$(SolutionDir)Debug\libogg&quot;;&quot;$(SolutionDir)Debug\libtheora&quot;;&quot;$(SolutionDir)Debug\libspeex&quot;;&quot;$(SolutionDir)Debug\libgsm&quot;"
 			/>
@@ -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="&quot;$(SolutionDir)Release\libiax2&quot;;&quot;$(SolutionDir)Release\libportaudio&quot;;&quot;$(SolutionDir)Release\libportmixer&quot;;&quot;$(SolutionDir)Release\libspeex&quot;;&quot;$(SolutionDir)Release\libgsm&quot;"
+			/>
+			<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="&quot;$(SolutionDir)Debug\libiax2&quot;;&quot;$(SolutionDir)Debug\libportaudio&quot;;&quot;$(SolutionDir)Debug\libportmixer&quot;;&quot;$(SolutionDir)Debug\libspeex&quot;;&quot;$(SolutionDir)Debug\libgsm&quot;"
+			/>
+			<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="&quot;$(DXSDK_DIR)\lib\x86&quot;;..\..\..\..\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;&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+				PreprocessorDefinitions="XRCDIRECTORY=\&quot;..\\rc\&quot;;IAXCOMM_VERSION=\&quot;1.0.0final\&quot;;WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib  ws2_32.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;C:\wxWidgets-2.8.6\lib\vc_lib&quot;;..\..\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;&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+				PreprocessorDefinitions="XRCDIRECTORY=\&quot;..\\rc\&quot;;IAXCOMM_VERSION=\&quot;1.0.0final\&quot;;WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				AssemblerOutput="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;C:\wxWidgets-2.8.6\lib\vc_lib&quot;;..\..\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;&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+				PreprocessorDefinitions="XRCDIRECTORY=\&quot;..\\rc\&quot;;IAXCOMM_VERSION=\&quot;1.0.0final\&quot;;WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;C:\wxWidgets-2.8.6\lib\vc_lib&quot;;..\..\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;&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+				PreprocessorDefinitions="XRCDIRECTORY=\&quot;..\\rc\&quot;;IAXCOMM_VERSION=\&quot;1.0.0final\&quot;;WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				AssemblerOutput="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;C:\wxWidgets-2.8.6\lib\vc_lib&quot;;..\..\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;&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+				PreprocessorDefinitions="XRCDIRECTORY=\&quot;..\\rc\&quot;;IAXCOMM_VERSION=\&quot;1.0.0final\&quot;;WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				AssemblerOutput="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;C:\wxWidgets-2.8.6\lib\vc_lib&quot;;..\..\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;&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+				PreprocessorDefinitions="XRCDIRECTORY=\&quot;..\\rc\&quot;;IAXCOMM_VERSION=\&quot;1.0.0final\&quot;;WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				AssemblerOutput="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;C:\wxWidgets-2.8.6\lib\vc_lib&quot;;..\..\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;&quot;C:\wxWidgets-2.8.6\include&quot;;&quot;C:\wxWidgets-2.8.6\include\msvc&quot;"
+				PreprocessorDefinitions="XRCDIRECTORY=\&quot;..\\r...
 
[truncated message content]