Menu
▾
▴
[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;".. \..\lib\portaudio\pablio";..\..\lib;..\..\lib\SDL\include;"$(SDL_DIR)\include""
- 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;".. \..\lib\portaudio\pablio";..\..\lib;..\..\lib\SDL\include;"$(SDL_DIR)\include""
- 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.
|
