Menu
▾
▴
iaxclient-cvs — Subversion commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(68) |
Jul
(27) |
Aug
(1) |
Sep
(9) |
Oct
(16) |
Nov
(64) |
Dec
(18) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(11) |
Feb
(5) |
Mar
(20) |
Apr
(9) |
May
(8) |
Jun
(8) |
Jul
(2) |
Aug
|
Sep
(11) |
Oct
(34) |
Nov
(23) |
Dec
(34) |
| 2005 |
Jan
(41) |
Feb
(25) |
Mar
(25) |
Apr
(32) |
May
(27) |
Jun
(9) |
Jul
(36) |
Aug
(6) |
Sep
(3) |
Oct
(11) |
Nov
(2) |
Dec
(21) |
| 2006 |
Jan
(14) |
Feb
(8) |
Mar
(18) |
Apr
(6) |
May
|
Jun
(17) |
Jul
(14) |
Aug
(26) |
Sep
(34) |
Oct
(24) |
Nov
(48) |
Dec
(64) |
| 2007 |
Jan
(72) |
Feb
(21) |
Mar
(50) |
Apr
(41) |
May
(35) |
Jun
(50) |
Jul
(33) |
Aug
(32) |
Sep
(50) |
Oct
(85) |
Nov
(43) |
Dec
(33) |
| 2008 |
Jan
(10) |
Feb
(29) |
Mar
(15) |
Apr
(45) |
May
(5) |
Jun
(2) |
Jul
(14) |
Aug
(3) |
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(9) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ma...@us...> - 2008-04-23 14:32:01
|
Revision: 1417
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1417&view=rev
Author: matben
Date: 2008-04-23 07:32:05 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
* Added -lrt flag to handle clock_gettime().
Modified Paths:
--------------
trunk/contrib/tcl/configure
trunk/contrib/tcl/configure.in
Modified: trunk/contrib/tcl/configure
===================================================================
--- trunk/contrib/tcl/configure 2008-04-23 12:40:14 UTC (rev 1416)
+++ trunk/contrib/tcl/configure 2008-04-23 14:32:05 UTC (rev 1417)
@@ -6169,7 +6169,7 @@
- vars="-liaxclient -lportaudio -lspeex -lspeexdsp"
+ vars="-liaxclient -lportaudio -lspeex -lspeexdsp -lrt"
for i in $vars; do
if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
# Convert foo.lib to -lfoo for GCC. No-op if not *.lib
Modified: trunk/contrib/tcl/configure.in
===================================================================
--- trunk/contrib/tcl/configure.in 2008-04-23 12:40:14 UTC (rev 1416)
+++ trunk/contrib/tcl/configure.in 2008-04-23 14:32:05 UTC (rev 1417)
@@ -73,7 +73,7 @@
TEA_ADD_SOURCES([iaxclient.c tones.c XThreadUtil.c])
TEA_ADD_HEADERS([])
-TEA_ADD_LIBS([-liaxclient -lportaudio -lspeex -lspeexdsp])
+TEA_ADD_LIBS([-liaxclient -lportaudio -lspeex -lspeexdsp -lrt])
TEA_ADD_CFLAGS([])
TEA_ADD_STUB_SOURCES([])
TEA_ADD_TCL_SOURCES([iaxclient.tcl])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-04-23 12:40:07
|
Revision: 1416
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1416&view=rev
Author: matben
Date: 2008-04-23 05:40:14 -0700 (Wed, 23 Apr 2008)
Log Message:
-----------
* changed link order of speex and portaudio libs
Modified Paths:
--------------
trunk/contrib/tcl/build-iaxclient.txt
trunk/contrib/tcl/configure
trunk/contrib/tcl/configure.in
Modified: trunk/contrib/tcl/build-iaxclient.txt
===================================================================
--- trunk/contrib/tcl/build-iaxclient.txt 2008-04-17 06:39:34 UTC (rev 1415)
+++ trunk/contrib/tcl/build-iaxclient.txt 2008-04-23 12:40:14 UTC (rev 1416)
@@ -1,78 +1,78 @@
-
-My own HOWTO of how I built all this stuff
-------------------------------------------
-
-Linux/Unix:
------------
-
-1) Portaudio:
-./configure --disable-shared --without-jack
-make
-make install
-
-2) Speex:
-./configure --disable-shared
-make
-make install
-
-for the external libs. For iaxclient I do:
-
-./configure --without-ogg --without-theora --without-vidcap \
- --disable-video --disable-clients --disable-shared
-
-etc. The tcl package should build as usual using ./configure && make.
-You may need to edit configure.in since I have added -lasound which
-I really don't know the details of. Don't forget to use autconf after
-editing. I read somewhere that setting
-
-export LDFLAGS="-Wl,-static"
-
-can be helpful to force linking to static libs. Use this *only* for the
-tcl package. Noted that ./configure bails with hese flags.
-
-
-MacOSX 10.5
------------
-
-1) pkg-config:
-Installed darwinports and|or fink and be sure to get pkgconfig as well
-
-2) Portaudio:
-http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz
-#export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
-./configure --disable-shared && make install
-
-3) Speex:
-http://downloads.xiph.org/releases/speex/speex-1.2beta3.tar.gz
-#export CFLAGS="-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
-./configure --disable-shared && make install
-
-4) iaxclient 2.1beta3:
- PKG_CONFIG path to pkg-config utility
-export PKG_CONFIG=`which pkg-config`
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
-./autogen.sh
-./configure --without-ogg --without-theora --without-vidcap \
- --disable-video --disable-clients --disable-shared
-make
-ll lib/.libs/
-make install
-
-For the actual tcl package you have two options:
-1) use the Xcode project
-2) use the TEA configure/make system as:
- ./configure --prefix=/usr/local --libdir=/Library/Tcl --with-tcl=/Library/Frameworks/Tcl.framework --with-tclinclude=/Library/Frameworks/Tcl.framework/Headers --enable-threads
- make
-
-Alternatively you can create a separate build directory.
-cd iaxclient/contrib/tcl/
-mkdir build
-cd build
-../configure ...
-I haven't figured out how to make a universal build since portaudio (?)
-complains when setting export CFLAGS="-arch ppc -arch i386"
-
-
-Windows:
---------
-
+
+My own HOWTO of how I built all this stuff
+------------------------------------------
+
+Linux/Unix:
+-----------
+
+1) Portaudio:
+./configure --disable-shared --without-jack
+make
+make install
+
+2) Speex:
+./configure --disable-shared
+make
+make install
+
+for the external libs. For iaxclient I do:
+
+./configure --without-ogg --without-theora --without-vidcap \
+ --disable-video --disable-clients --disable-shared
+
+etc. The tcl package should build as usual using ./configure && make.
+You may need to edit configure.in since I have added -lasound which
+I really don't know the details of. Don't forget to use autconf after
+editing. I read somewhere that setting
+
+export LDFLAGS="-Wl,-static"
+
+can be helpful to force linking to static libs. Use this *only* for the
+tcl package. Noted that ./configure bails with hese flags.
+
+
+MacOSX 10.5
+-----------
+
+1) pkg-config:
+Installed darwinports and|or fink and be sure to get pkgconfig as well
+
+2) Portaudio:
+http://www.portaudio.com/archives/pa_stable_v19_20071207.tar.gz
+#export CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+./configure --disable-shared && make install
+
+3) Speex:
+http://downloads.xiph.org/releases/speex/speex-1.2beta3.tar.gz
+#export CFLAGS="-arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+./configure --disable-shared && make install
+
+4) iaxclient 2.1beta3:
+ PKG_CONFIG path to pkg-config utility
+export PKG_CONFIG=`which pkg-config`
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
+./autogen.sh
+./configure --without-ogg --without-theora --without-vidcap \
+ --disable-video --disable-clients --disable-shared
+make
+ll lib/.libs/
+make install
+
+For the actual tcl package you have two options:
+1) use the Xcode project
+2) use the TEA configure/make system as:
+ ./configure --prefix=/usr/local --libdir=/Library/Tcl --with-tcl=/Library/Frameworks/Tcl.framework --with-tclinclude=/Library/Frameworks/Tcl.framework/Headers --enable-threads
+ make
+
+Alternatively you can create a separate build directory.
+cd iaxclient/contrib/tcl/
+mkdir build
+cd build
+../configure ...
+I haven't figured out how to make a universal build since portaudio (?)
+complains when setting export CFLAGS="-arch ppc -arch i386"
+
+
+Windows:
+--------
+
Modified: trunk/contrib/tcl/configure
===================================================================
--- trunk/contrib/tcl/configure 2008-04-17 06:39:34 UTC (rev 1415)
+++ trunk/contrib/tcl/configure 2008-04-23 12:40:14 UTC (rev 1416)
@@ -1,55 +1,26 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for tcliaxclient 0.2.
+# Generated by GNU Autoconf 2.59 for tcliaxclient 0.2.
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
+# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
@@ -58,43 +29,8 @@
fi
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" "" $as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
-fi
-
# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
+$as_unset ENV MAIL MAILPATH
PS1='$ '
PS2='> '
PS4='+ '
@@ -108,19 +44,18 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ $as_unset $as_var
fi
done
# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
as_expr=expr
else
as_expr=false
fi
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -128,388 +63,157 @@
# Name of the executable.
-as_me=`$as_basename -- "$0" ||
+as_me=`$as_basename "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ X"$0" : 'X\(/\)$' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
+ /^X\/\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
-if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
-else
- as_have_required=no
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
+ # Find who we are. Look in the path if we contain no path at all
+ # relative or not.
+ case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
-else
- as_candidate_shells=
+ ;;
+ esac
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
+ # in which case we are not to be found in the path.
+ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+ { (exit 1); exit 1; }; }
+ fi
+ case $CONFIG_SHELL in
+ '')
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ for as_base in sh bash ksh sh5; do
+ case $as_dir in
/*)
- for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
- done;;
- esac
-done
-IFS=$as_save_IFS
-
-
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
+ if ("$as_dir/$as_base" -c '
as_lineno_1=$LINENO
as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ CONFIG_SHELL=$as_dir/$as_base
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ fi;;
+ esac
+ done
+done
+;;
+ esac
-_ASEOF
-}; then
- break
-fi
-
-fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell aut...@gn... about your system,
- echo including any error possibly output before this
- echo message
-}
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
+ # line-number line before each line; the second 'sed' does the real
+ # work. The second script uses 'N' to pair each line-number line
+ # with the numbered line, and appends trailing '-' during
+ # substitution so that $LINENO is not a special case at line end.
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+ sed '=' <$as_myself |
sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ s,$,-,
+ : loop
+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
t loop
- s/-\n.*//
+ s,-$,,
+ s,^['$as_cr_digits']*\n,,
' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
+ chmod +x $as_me.lineno ||
{ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
+ # original and so on. Autoconf is especially sensible to this).
+ . ./$as_me.lineno
# Exit status is that of the last command.
exit
}
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
- case `echo 'x\c'` in
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
- esac;;
-*)
- ECHO_N='-n';;
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+ *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T=' ' ;;
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir
-fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ # We could just check for DJGPP; but this test a) works b) is more generic
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+ if test -f conf$$.exe; then
+ # Don't use ln at all; we don't have any links
as_ln_s='cp -p'
+ else
+ as_ln_s='ln -s'
+ fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+rm -f conf$$ conf$$.exe conf$$.file
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -518,28 +222,7 @@
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -548,27 +231,39 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" $as_nl"
-exec 7<&0 </dev/null 6>&1
+# CDPATH.
+$as_unset CDPATH
+
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+exec 6>&1
+
#
# Initializations.
#
ac_default_prefix=/usr/local
-ac_clean_files=
ac_config_libobj_dir=.
-LIBOBJS=
cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete. It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
# Identity of this package.
PACKAGE_NAME='tcliaxclient'
PACKAGE_TARNAME='tcliaxclient'
@@ -579,156 +274,43 @@
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#ifdef HAVE_SYS_STAT_H
+#if HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef STDC_HEADERS
+#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# ifdef HAVE_STDLIB_H
+# if HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#ifdef HAVE_STRINGS_H
+#if HAVE_STRINGS_H
# include <strings.h>
#endif
-#ifdef HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H
# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-CYGPATH
-EXEEXT
-PKG_LIB_FILE
-PKG_STUB_LIB_FILE
-PKG_STUB_SOURCES
-PKG_STUB_OBJECTS
-PKG_TCL_SOURCES
-PKG_HEADERS
-PKG_INCLUDES
-PKG_LIBS
-PKG_CFLAGS
-TCL_VERSION
-TCL_BIN_DIR
-TCL_SRC_DIR
-TCL_LIB_FILE
-TCL_LIB_FLAG
-TCL_LIB_SPEC
-TCL_STUB_LIB_FILE
-TCL_STUB_LIB_FLAG
-TCL_STUB_LIB_SPEC
-TCL_LIBS
-TCL_DEFS
-TCL_EXTRA_CFLAGS
-TCL_LD_FLAGS
-TCL_SHLIB_LD_LIBS
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-OBJEXT
-CPP
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-SET_MAKE
-RANLIB
-GREP
-EGREP
-MATH_LIBS
-PKG_SOURCES
-PKG_OBJECTS
-CLEANFILES
-TCL_INCLUDES
-TCL_THREADS
-SHARED_BUILD
-AR
-CELIB_DIR
-LIBOBJS
-DL_LIBS
-CFLAGS_DEBUG
-CFLAGS_OPTIMIZE
-CFLAGS_WARNING
-STLIB_LD
-SHLIB_LD
-SHLIB_LD_LIBS
-SHLIB_CFLAGS
-LD_LIBRARY_PATH_VAR
-TCL_DBGX
-CFLAGS_DEFAULT
-LDFLAGS_DEFAULT
-MAKE_LIB
-MAKE_SHARED_LIB
-MAKE_STATIC_LIB
-MAKE_STUB_LIB
-RANLIB_STUB
-TCLSH_PROG
-LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS PKG_SOURCES PKG_OBJECTS CLEANFILES TCL_INCLUDES TCL_THREADS SHARED_BUILD AR CELIB_DIR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG LTLIBOBJS'
ac_subst_files=''
- ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
@@ -754,48 +336,34 @@
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
+datadir='${prefix}/share'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
ac_prev=
-ac_dashdash=
for ac_option
do
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
+ eval "$ac_prev=\$ac_option"
ac_prev=
continue
fi
- case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
- esac
+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
# Accept the important Cygnus configure options, so we can diagnose typos.
- case $ac_dashdash$ac_option in
- --)
- ac_dashdash=yes ;;
+ case $ac_option in
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
@@ -817,45 +385,33 @@
--config-cache | -C)
cache_file=config.cache ;;
- -datadir | --datadir | --datadi | --datad)
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
datadir=$ac_optarg ;;
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
- | --dataroo | --dataro | --datar)
- ac_prev=datarootdir ;;
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
- datarootdir=$ac_optarg ;;
-
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ eval "enable_$ac_feature=no" ;;
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
- docdir=$ac_optarg ;;
-
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
- ac_prev=dvidir ;;
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
- dvidir=$ac_optarg ;;
-
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) ac_optarg=yes ;;
+ esac
+ eval "enable_$ac_feature='$ac_optarg'" ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -882,12 +438,6 @@
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
- ac_prev=htmldir ;;
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
- | --ht=*)
- htmldir=$ac_optarg ;;
-
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
@@ -912,16 +462,13 @@
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
- -localedir | --localedir | --localedi | --localed | --locale)
- ac_prev=localedir ;;
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
- localedir=$ac_optarg ;;
-
-localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst | --locals)
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
ac_prev=localstatedir ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -986,16 +533,6 @@
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
- ac_prev=pdfdir ;;
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
- pdfdir=$ac_optarg ;;
-
- -psdir | --psdir | --psdi | --psd | --ps)
- ac_prev=psdir ;;
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
-
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@@ -1048,20 +585,24 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ ac_package=`echo $ac_package| sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) ac_optarg=yes ;;
+ esac
+ eval "with_$ac_package='$ac_optarg'" ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
+ eval "with_$ac_package=no" ;;
--x)
# Obsolete; use --with-x.
@@ -1092,7 +633,8 @@
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
- eval $ac_envvar=\$ac_optarg
+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+ eval "$ac_envvar='$ac_optarg'"
export $ac_envvar ;;
*)
@@ -1112,21 +654,29 @@
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute directory names.
-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
do
- eval ac_val=\$$ac_var
+ eval ac_val=$`echo $ac_var`
case $ac_val in
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
done
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+ localstatedir libdir includedir oldincludedir infodir mandir
+do
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) ;;
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
+ esac
+done
+
# There might be people who depend on the old broken behavior: `$host'
# used to hold the argument of --host etc.
# FIXME: To remove some day.
@@ -1151,76 +701,74 @@
test "$silent" = yes && exec 6>/dev/null
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
-
-
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
+ # Try the directory containing this script, then its parent.
+ ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$0" : 'X\(//\)[^/]' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r "$srcdir/$ac_unique_file"; then
+ if test ! -r $srcdir/$ac_unique_file; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+if test ! -r $srcdir/$ac_unique_file; then
+ if test "$ac_srcdir_defaulted" = yes; then
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
{ (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ else
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
- pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
- srcdir=.
+ fi
fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
#
# Report the --help message.
@@ -1249,6 +797,9 @@
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
+_ACEOF
+
+ cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
@@ -1266,22 +817,15 @@
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/tcliaxclient]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --infodir=DIR info documentation [PREFIX/info]
+ --mandir=DIR man documentation [PREFIX/man]
_ACEOF
cat <<\_ACEOF
@@ -1319,95 +863,128 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
+ headers in a nonstandard directory <include dir>
CPP C preprocessor
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
_ACEOF
-ac_status=$?
fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
+ ac_popdir=`pwd`
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d $ac_dir || continue
ac_builddir=.
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
+if test "$ac_dir" != .; then
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
+fi
case $srcdir in
- .) # We are building in place.
+ .) # No --srcdir option. We are building in place.
ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
+
+ cd $ac_dir
+ # Check for guested configure; otherwise get Cygnus style configure.
+ if test -f $ac_srcdir/configure.gnu; then
+ echo
+ $SHELL $ac_srcdir/configure.gnu --help=recursive
+ elif test -f $ac_srcdir/configure; then
+ echo
+ $SHELL $ac_srcdir/configure --help=recursive
+ elif test -f $ac_srcdir/configure.ac ||
+ test -f $ac_srcdir/configure.in; then
+ echo
+ $ac_configure --help
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
+ fi
+ cd $ac_popdir
done
fi
-test -n "$ac_init_help" && exit $ac_status
+test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
tcliaxclient configure 0.2
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.59
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
- exit
+ exit 0
fi
-cat >config.log <<_ACEOF
+exec 5>config.log
+cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by tcliaxclient $as_me 0.2, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
_ACEOF
-exec 5>>config.log
{
cat <<_ASUNAME
## --------- ##
@@ -1426,7 +1003,7 @@
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
@@ -1440,7 +1017,6 @@
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
-IFS=$as_save_IFS
} >&5
@@ -1462,6 +1038,7 @@
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
+ac_sep=
ac_must_keep_next=false
for ac_pass in 1 2
do
@@ -1472,7 +1049,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
- *\'*)
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1494,7 +1071,9 @@
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+ # Get rid of the leading space.
+ ac_sep=" "
;;
esac
done
@@ -1505,8 +1084,8 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
@@ -1519,34 +1098,20 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
- done
+{
(set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
sed -n \
- "s/'\''/'\''\\\\'\'''\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
- ;; #(
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ ;;
*)
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ sed -n \
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
- esac |
- sort
-)
+ esac;
+}
echo
cat <<\_ASBOX
@@ -1557,28 +1122,22 @@
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- echo "$ac_var='\''$ac_val'\''"
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
if test -n "$ac_subst_files"; then
cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
+## ------------- ##
+## Output files. ##
+## ------------- ##
_ASBOX
echo
for ac_var in $ac_subst_files
do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- echo "$ac_var='\''$ac_val'\''"
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
fi
@@ -1590,24 +1149,26 @@
## ----------- ##
_ASBOX
echo
- cat confdefs.h
+ sed "/^$/d" confdefs.h | sort
echo
fi
test "$ac_signal" != 0 &&
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ rm -f core *.core &&
+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
-' 0
+ ' 0
for ac_signal in 1 2 13 15; do
trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
# Predefined preprocessor variables.
@@ -1638,17 +1199,14 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+if test -z "$CONFIG_SITE"; then
+ if test "x$prefix" != xNONE; then
+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+ else
+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ fi
fi
-shift
-for ac_site_file
-do
+for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1664,8 +1222,8 @@
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
- *) . "./$cache_file";;
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+ *) . ./$cache_file;;
esac
fi
else
@@ -1677,11 +1235,12 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
+for ac_var in `(set) 2>&1 |
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+ eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1706,7 +1265,8 @@
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1723,6 +1283,11 @@
{ (exit 1); exit 1; }; }
fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -1747,14 +1312,10 @@
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
@@ -1766,8 +1327,8 @@
# are compatible with.
TEA_VERSION="3.5"
- { echo "$as_me:$LINENO: checking for correct TEA configuration" >&5
-echo $ECHO_N "checking for correct TEA configuration... $ECHO_C" >&6; }
+ echo "$as_me:$LINENO: checking for correct TEA configuration" >&5
+echo $ECHO_N "checking for correct TEA configuration... $ECHO_C" >&6
if test x"${PACKAGE_NAME}" = x ; then
{ { echo "$as_me:$LINENO: error:
The PACKAGE_NAME variable must be defined by your TEA configure.in" >&5
@@ -1782,18 +1343,18 @@
TEA version not specified." >&2;}
{ (exit 1); exit 1; }; }
elif test "3.5" != "${TEA_VERSION}" ; then
- { echo "$as_me:$LINENO: result: warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&5
-echo "${ECHO_T}warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&6; }
+ echo "$as_me:$LINENO: result: warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&5
+echo "${ECHO_T}warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&6
else
- { echo "$as_me:$LINENO: result: ok (TEA ${TEA_VERSION})" >&5
-echo "${ECHO_T}ok (TEA ${TEA_VERSION})" >&6; }
+ echo "$as_me:$LINENO: result: ok (TEA ${TEA_VERSION})" >&5
+echo "${ECHO_T}ok (TEA ${TEA_VERSION})" >&6
fi
case "`uname -s`" in
*win32*|*WIN32*|*CYGWIN_NT*|*CYGWIN_9*|*CYGWIN_ME*|*MINGW32_*)
# Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_CYGPATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -1806,28 +1367,26 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CYGPATH="cygpath -w"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
-IFS=$as_save_IFS
test -z "$ac_cv_prog_CYGPATH" && ac_cv_prog_CYGPATH="echo"
fi
fi
CYGPATH=$ac_cv_prog_CYGPATH
if test -n "$CYGPATH"; then
- { echo "$as_me:$LINENO: result: $CYGPATH" >&5
-echo "${ECHO_T}$CYGPATH" >&6; }
+ echo "$as_me:$LINENO: result: $CYGPATH" >&5
+echo "${ECHO_T}$CYGPATH" >&6
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-
EXEEXT=".exe"
TEA_PLATFORM="windows"
;;
@@ -1867,37 +1426,31 @@
ac_aux_dir=
-for ac_dir in tclconfig "$srcdir"/tclconfig; do
- if test -f "$ac_dir/install-sh"; then
+for ac_dir in tclconfig $srcdir/tclconfig; do
+ if test -f $ac_dir/install-sh; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
break
- elif test -f "$ac_dir/install.sh"; then
+ elif test -f $ac_dir/install.sh; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install.sh -c"
break
- elif test -f "$ac_dir/shtool"; then
+ elif test -f $ac_dir/shtool; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/shtool install -c"
break
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in tclconfig \"$srcdir\"/tclconfig" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in tclconfig \"$srcdir\"/tclconfig" >&2;}
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in tclconfig $srcdir/tclconfig" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in tclconfig $srcdir/tclconfig" >&2;}
{ (exit 1); exit 1; }; }
fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-
-
#--------------------------------------------------------------------
# Load the tclConfig.sh file
#--------------------------------------------------------------------
@@ -1914,13 +1467,13 @@
# we reset no_tcl in case something fails here
no_tcl=true
-# Check whether --with-tcl was given.
+# Check whether --with-tcl or --without-tcl was given.
if test "${with_tcl+set}" = set; then
- withval=$with_tcl; with_tclconfig=${withval}
-fi
-
- { echo "$as_me:$LINENO: checking for Tcl configuration" >&5
-echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6; }
+ withval="$with_tcl"
+ with_tclconfig=${withval}
+fi;
+ echo "$as_me:$LINENO: checking for Tcl configuration" >&5
+echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6
if test "${ac_cv_c_tclconfig+set}" = set; then
echo $ECHO_N "(cached) $ECHO...
[truncated message content] |
|
From: <ma...@us...> - 2008-04-17 06:39:27
|
Revision: 1415
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1415&view=rev
Author: matben
Date: 2008-04-16 23:39:34 -0700 (Wed, 16 Apr 2008)
Log Message:
-----------
* Added comment about link flags
Modified Paths:
--------------
trunk/contrib/tcl/build-iaxclient.txt
Modified: trunk/contrib/tcl/build-iaxclient.txt
===================================================================
--- trunk/contrib/tcl/build-iaxclient.txt 2008-04-16 21:29:18 UTC (rev 1414)
+++ trunk/contrib/tcl/build-iaxclient.txt 2008-04-17 06:39:34 UTC (rev 1415)
@@ -5,8 +5,12 @@
Linux/Unix:
-----------
-Just do
+1) Portaudio:
+./configure --disable-shared --without-jack
+make
+make install
+2) Speex:
./configure --disable-shared
make
make install
@@ -19,9 +23,14 @@
etc. The tcl package should build as usual using ./configure && make.
You may need to edit configure.in since I have added -lasound which
I really don't know the details of. Don't forget to use autconf after
-editing.
+editing. I read somewhere that setting
+export LDFLAGS="-Wl,-static"
+can be helpful to force linking to static libs. Use this *only* for the
+tcl package. Noted that ./configure bails with hese flags.
+
+
MacOSX 10.5
-----------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-16 21:29:11
|
Revision: 1414
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1414&view=rev
Author: jpgrayson
Date: 2008-04-16 14:29:18 -0700 (Wed, 16 Apr 2008)
Log Message:
-----------
Patch from Steven Henke adding radio tranceiver functionality to iaxclient.
Modified Paths:
--------------
trunk/lib/iaxclient.h
trunk/lib/iaxclient_lib.c
trunk/lib/libiax2/src/frame.h
trunk/lib/libiax2/src/iax-client.h
trunk/lib/libiax2/src/iax.c
Modified: trunk/lib/iaxclient.h
===================================================================
--- trunk/lib/iaxclient.h 2008-04-16 14:29:08 UTC (rev 1413)
+++ trunk/lib/iaxclient.h 2008-04-16 21:29:18 UTC (rev 1414)
@@ -143,6 +143,7 @@
#define IAXC_CALL_STATE_SELECTED (1<<5) /*!< Indicates the call is selected */
#define IAXC_CALL_STATE_BUSY (1<<6) /*!< Indicates a call is busy */
#define IAXC_CALL_STATE_TRANSFER (1<<7) /*!< Indicates the call transfer has been released */
+#define IAXC_CALL_STATE_KEYED (1<<8) /*!< Indicates the call radio is activated */
/*! Indicates that text is for an IAXClient status change */
#define IAXC_TEXT_TYPE_STATUS 1
@@ -773,6 +774,18 @@
EXPORT void iaxc_answer_call(int callNo);
/*!
+ Radio Transmitter and Receiver Control Activiate
+ \param callNo The number of the call to activate
+*/
+EXPORT void iaxc_key_radio(int callNo);
+
+/*!
+ Radio Transmitter and Receiver Control Deactivate
+ \param callNo The number of the call to deactivate
+*/
+EXPORT void iaxc_unkey_radio(int callNo);
+
+/*!
Initiate a blind call transfer of \a callNo to \a number.
\param callNo The active call to transfer.
\param number The number to transfer the call to. See draft-guy-iax-03 section 8.4.1 for further details.
Modified: trunk/lib/iaxclient_lib.c
===================================================================
--- trunk/lib/iaxclient_lib.c 2008-04-16 14:29:08 UTC (rev 1413)
+++ trunk/lib/iaxclient_lib.c 2008-04-16 21:29:18 UTC (rev 1414)
@@ -1153,6 +1153,16 @@
// XXX does the session go away now?
iaxc_clear_call(callNo);
break;
+ case IAX_EVENT_KEY:
+ calls[callNo].state |= IAXC_CALL_STATE_KEYED;
+ iaxci_do_state_callback(callNo);
+ iaxci_usermsg(IAXC_STATUS,"Call %d Radio Key", callNo);
+ break;
+ case IAX_EVENT_UNKEY:
+ calls[callNo].state &= ~IAXC_CALL_STATE_KEYED;
+ iaxci_do_state_callback(callNo);
+ iaxci_usermsg(IAXC_STATUS,"Call %d Radio Unkey", callNo);
+ break;
case IAX_EVENT_REJECT:
iaxci_usermsg(IAXC_STATUS, "Call rejected by remote");
iaxc_clear_call(callNo);
@@ -1425,6 +1435,22 @@
iaxci_do_state_callback(callNo);
}
+EXPORT void iaxc_key_radio(int callNo)
+{
+ if ( callNo < 0 )
+ return;
+
+ iax_key_radio(calls[callNo].session);
+}
+
+EXPORT void iaxc_unkey_radio(int callNo)
+{
+ if ( callNo < 0 )
+ return;
+
+ iax_unkey_radio(calls[callNo].session);
+}
+
EXPORT void iaxc_blind_transfer_call(int callNo, const char * dest_extension)
{
if ( callNo < 0 || !(calls[callNo].state & IAXC_CALL_STATE_ACTIVE) )
Modified: trunk/lib/libiax2/src/frame.h
===================================================================
--- trunk/lib/libiax2/src/frame.h 2008-04-16 14:29:08 UTC (rev 1413)
+++ trunk/lib/libiax2/src/frame.h 2008-04-16 21:29:18 UTC (rev 1414)
@@ -99,6 +99,8 @@
#define AST_CONTROL_FLASH 9 /* Flash hook */
#define AST_CONTROL_WINK 10 /* Wink */
#define AST_CONTROL_OPTION 11 /* Set an option */
+#define AST_CONTROL_KEY 12 /* Key Radio */
+#define AST_CONTROL_UNKEY 13 /* Unkey Radio */
#define AST_FRIENDLY_OFFSET 64 /* Reserved header space */
Modified: trunk/lib/libiax2/src/iax-client.h
===================================================================
--- trunk/lib/libiax2/src/iax-client.h 2008-04-16 14:29:08 UTC (rev 1413)
+++ trunk/lib/libiax2/src/iax-client.h 2008-04-16 21:29:18 UTC (rev 1414)
@@ -80,8 +80,9 @@
#define IAX_EVENT_CNG 32 /* Comfort-noise (almost silence) */
#define IAX_EVENT_POKE 33
#define IAX_EVENT_VIDEO 34 /* Send/receive video */
+#define IAX_EVENT_KEY 35 /* Radio Control Key */
+#define IAX_EVENT_UNKEY 36 /* Radio Control UnKey */
-
/* moved from iax.c to support attended transfer */
#define IAX_EVENT_REREQUEST 999
#define IAX_EVENT_TXREPLY 1000
@@ -195,6 +196,9 @@
extern int iax_send_video(struct iax_session *session, int format, unsigned char *data, int datalen, int fullframe);
extern int iax_send_video_trunk(struct iax_session *session, int format, char *data, int datalen, int fullframe, int ntrunk);
+extern int iax_key_radio(struct iax_session *session);
+extern int iax_unkey_radio(struct iax_session *session);
+
extern void iax_destroy(struct iax_session * session);
extern void iax_enable_debug(void);
Modified: trunk/lib/libiax2/src/iax.c
===================================================================
--- trunk/lib/libiax2/src/iax.c 2008-04-16 14:29:08 UTC (rev 1413)
+++ trunk/lib/libiax2/src/iax.c 2008-04-16 21:29:18 UTC (rev 1414)
@@ -1878,6 +1878,16 @@
return send_command(session, AST_FRAME_CONTROL, AST_CONTROL_ANSWER, 0, NULL, 0, -1);
}
+int iax_key_radio(struct iax_session *session)
+{
+ return send_command(session, AST_FRAME_CONTROL, AST_CONTROL_KEY, 0, NULL, 0, -1);
+}
+
+int iax_unkey_radio(struct iax_session *session)
+{
+ return send_command(session, AST_FRAME_CONTROL, AST_CONTROL_UNKEY, 0, NULL, 0, -1);
+}
+
int iax_load_complete(struct iax_session *session)
{
return send_command(session, AST_FRAME_HTML, AST_HTML_LDCOMPLETE, 0, NULL, 0, -1);
@@ -2958,6 +2968,14 @@
e->etype = IAX_EVENT_RINGA;
e = schedule_delivery(e, ts, updatehistory);
break;
+ case AST_CONTROL_KEY:
+ e->etype = IAX_EVENT_KEY;
+ e = schedule_delivery(e, ts, updatehistory);
+ break;
+ case AST_CONTROL_UNKEY:
+ e->etype = IAX_EVENT_UNKEY;
+ e = schedule_delivery(e, ts, updatehistory);
+ break;
default:
DEBU(G "Don't know what to do with AST control %d\n", subclass);
free(e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-04-16 14:32:25
|
Revision: 1413
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1413&view=rev
Author: matben
Date: 2008-04-16 07:29:08 -0700 (Wed, 16 Apr 2008)
Log Message:
-----------
* [Bugfix]: fixes core dump (Andrea Suisani)
Modified Paths:
--------------
trunk/contrib/tcl/iaxclient.c
Modified: trunk/contrib/tcl/iaxclient.c
===================================================================
--- trunk/contrib/tcl/iaxclient.c 2008-04-15 22:38:26 UTC (rev 1412)
+++ trunk/contrib/tcl/iaxclient.c 2008-04-16 14:29:08 UTC (rev 1413)
@@ -696,7 +696,9 @@
}
if ( result == TCL_OK ) {
iaxc_quelch(selected, 1);
- iaxc_select_call(-1);
+ // this core dumps, see iax...@li...
+ // Andrea Suisani <si...@op...>
+ //iaxc_select_call(-1);
}
return result;
}
@@ -1089,7 +1091,9 @@
}
if (result == TCL_OK) {
iaxc_unquelch(selected);
- iaxc_select_call(selected);
+ // this core dumps, see iax...@li...
+ // Andrea Suisani <si...@op...>
+ //iaxc_select_call(selected);
}
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:38:21
|
Revision: 1412
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1412&view=rev
Author: jpgrayson
Date: 2008-04-15 15:38:26 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Add const qualifier to some functions.
Modified Paths:
--------------
trunk/lib/audio_portaudio.c
Modified: trunk/lib/audio_portaudio.c
===================================================================
--- trunk/lib/audio_portaudio.c 2008-04-15 22:33:37 UTC (rev 1411)
+++ trunk/lib/audio_portaudio.c 2008-04-15 22:38:26 UTC (rev 1412)
@@ -209,7 +209,7 @@
return 0;
}
-static void mono2stereo(SAMPLE *out, SAMPLE *in, int nSamples)
+static void mono2stereo(SAMPLE *out, const SAMPLE *in, int nSamples)
{
int i;
for ( i=0; i < nSamples; i++ )
@@ -219,7 +219,7 @@
}
}
-static void stereo2mono(SAMPLE *out, SAMPLE *in, int nSamples)
+static void stereo2mono(SAMPLE *out, const SAMPLE *in, int nSamples)
{
int i;
for ( i=0; i < nSamples; i++ )
@@ -451,7 +451,7 @@
#endif
}
-static int pa_callback(void *inputBuffer, void *outputBuffer,
+static int pa_callback(const void *inputBuffer, void *outputBuffer,
unsigned long samplesPerFrame,
const PaStreamCallbackTimeInfo* outTime,
PaStreamCallbackFlags statusFlags,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:33:30
|
Revision: 1411
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1411&view=rev
Author: jpgrayson
Date: 2008-04-15 15:33:37 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Fix prototypes of some internal functions to reduce casting.
Modified Paths:
--------------
trunk/lib/audio_encode.c
Modified: trunk/lib/audio_encode.c
===================================================================
--- trunk/lib/audio_encode.c 2008-04-15 22:23:20 UTC (rev 1410)
+++ trunk/lib/audio_encode.c 2008-04-15 22:33:37 UTC (rev 1411)
@@ -118,7 +118,7 @@
speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &i);
}
-static void calculate_level(short *audio, int len, float *level)
+static void calculate_level(const short *audio, int len, float *level)
{
int big_sample = 0;
int i;
@@ -133,7 +133,7 @@
*level += ((float)big_sample / 32767.0f - *level) / 5.0f;
}
-static int input_postprocess(void *audio, int len, int rate)
+static int input_postprocess(short * audio, int len, int rate)
{
static float lowest_volume = 1.0f;
float volume;
@@ -149,7 +149,7 @@
set_speex_filters();
}
- calculate_level((short *)audio, len, &input_level);
+ calculate_level(audio, len, &input_level);
/* go through the motions only if we need at least one of the preprocessor filters */
if ( (iaxci_filters & (IAXC_FILTER_DENOISE | IAXC_FILTER_AGC | IAXC_FILTER_DEREVERB)) ||
@@ -213,9 +213,9 @@
return volume < iaxci_silence_threshold;
}
-static int output_postprocess(void *audio, int len)
+static int output_postprocess(const short * audio, int len)
{
- calculate_level((short *)audio, len, &output_level);
+ calculate_level(audio, len, &output_level);
do_level_callback();
@@ -342,8 +342,8 @@
/* decode encoded audio; return the number of bytes decoded
* negative indicates error */
-int audio_decode_audio(struct iaxc_call * call, void * out, void * data, int len,
- int format, int * samples)
+int audio_decode_audio(struct iaxc_call * call, void * out, void * data,
+ int len, int format, int * samples)
{
int insize = len;
int outsize = *samples;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:23:51
|
Revision: 1410
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1410&view=rev
Author: jpgrayson
Date: 2008-04-15 15:23:20 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Add IAXC_FILTER_DEREVERB flag to enable/disable speexdsp's dereverb preprocessor feature.
Note that currently speexdsp's dereverb feature doesn't do much.
Modified Paths:
--------------
trunk/lib/audio_encode.c
trunk/lib/iaxclient.h
Modified: trunk/lib/audio_encode.c
===================================================================
--- trunk/lib/audio_encode.c 2008-04-15 22:21:25 UTC (rev 1409)
+++ trunk/lib/audio_encode.c 2008-04-15 22:23:20 UTC (rev 1410)
@@ -104,12 +104,14 @@
speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_AGC, &i);
i = (iaxci_filters & IAXC_FILTER_DENOISE) ? 1 : 0;
speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &i);
+ i = (iaxci_filters & IAXC_FILTER_DEREVERB) ? 1 : 0;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DEREVERB, &i);
/*
- * We can tweak these parameters to play with VAD sensitivity.
- * For now, we use the default values since it seems they are a good starting point.
- * However, if need be, this is the code that needs to change
- */
+ * We can tweak these parameters to play with VAD sensitivity.
+ * For now, we use the default values since it seems they are a good starting point.
+ * However, if need be, this is the code that needs to change
+ */
i = 35;
speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &i);
i = 20;
@@ -149,8 +151,8 @@
calculate_level((short *)audio, len, &input_level);
- /* only preprocess if we're interested in VAD, AGC, or DENOISE */
- if ( (iaxci_filters & (IAXC_FILTER_DENOISE | IAXC_FILTER_AGC)) ||
+ /* go through the motions only if we need at least one of the preprocessor filters */
+ if ( (iaxci_filters & (IAXC_FILTER_DENOISE | IAXC_FILTER_AGC | IAXC_FILTER_DEREVERB)) ||
iaxci_silence_threshold > 0.0f )
silent = !speex_preprocess(st, (spx_int16_t *)audio, NULL);
@@ -350,7 +352,8 @@
if ( format == 0 )
{
- fprintf(stderr, "audio_decode_audio: Format is zero (should't happen)!\n");
+ fprintf(stderr, "audio_decode_audio: Format is zero "
+ "(should not happen)!\n");
return -1;
}
Modified: trunk/lib/iaxclient.h
===================================================================
--- trunk/lib/iaxclient.h 2008-04-15 22:21:25 UTC (rev 1409)
+++ trunk/lib/iaxclient.h 2008-04-15 22:23:20 UTC (rev 1410)
@@ -1063,6 +1063,7 @@
#define IAXC_FILTER_ECHO (1<<2) /*!< Echo cancellation filter */
#define IAXC_FILTER_AAGC (1<<3) /*!< Analog (mixer-based) Automatic Gain Control */
#define IAXC_FILTER_CN (1<<4) /*!< Send Comfort Noise (CN) frames when silence is detected */
+#define IAXC_FILTER_DEREVERB (1<<5) /*!< Reverb reduction filter */
/*!
Returns the set of audio filters being applied.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:22:44
|
Revision: 1409
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1409&view=rev
Author: jpgrayson
Date: 2008-04-15 15:21:25 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Whitespace.
Modified Paths:
--------------
trunk/lib/iaxclient_lib.c
Modified: trunk/lib/iaxclient_lib.c
===================================================================
--- trunk/lib/iaxclient_lib.c 2008-04-15 22:20:42 UTC (rev 1408)
+++ trunk/lib/iaxclient_lib.c 2008-04-15 22:21:25 UTC (rev 1409)
@@ -756,7 +756,9 @@
cur->session = iax_session_new();
if ( !cur->session )
{
- iaxci_usermsg(IAXC_ERROR, "Can't make new registration session");
+ iaxci_usermsg(IAXC_ERROR,
+ "Can't make new registration "
+ "session");
return;
}
iax_register(cur->session, cur->host, cur->user, cur->pass, cur->refresh);
@@ -1025,17 +1027,12 @@
#endif
struct iaxc_call *call;
- if ( callNo < 0 )
+ /* drop audio for unselected call? */
+ if ( callNo < 0 || callNo != selected_call )
return;
call = &calls[callNo];
- if ( callNo != selected_call )
- {
- /* drop audio for unselected call? */
- return;
- }
-
samples = fr_samples;
format = call->format & IAXC_AUDIO_FORMAT_MASK;
@@ -1055,13 +1052,16 @@
if ( bytes_decoded < 0 )
{
iaxci_usermsg(IAXC_STATUS,
- "Bad or incomplete voice packet. Unable to decode. dropping");
+ "Bad or incomplete voice packet. "
+ "Unable to decode. dropping");
return;
}
/* Pass encoded audio back to the app if required */
if ( audio_prefs & IAXC_AUDIO_PREF_RECV_REMOTE_ENCODED )
- iaxci_do_audio_callback(callNo, e->ts, IAXC_SOURCE_REMOTE,
+ iaxci_do_audio_callback(callNo,
+ e->ts,
+ IAXC_SOURCE_REMOTE,
1, format & IAXC_AUDIO_FORMAT_MASK,
e->datalen - total_consumed,
e->data + total_consumed);
@@ -1083,8 +1083,13 @@
// the number to obtain the size in bytes.
// format will also be 0 since this is raw audio
int size = (fr_samples - samples - mainbuf_delta) * 2;
- iaxci_do_audio_callback(callNo, e->ts, IAXC_SOURCE_REMOTE,
- 0, 0, size, (unsigned char *)fr);
+ iaxci_do_audio_callback(callNo,
+ e->ts,
+ IAXC_SOURCE_REMOTE,
+ 0,
+ 0,
+ size,
+ (unsigned char *)fr);
}
if ( iaxci_audio_output_mode )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:20:35
|
Revision: 1408
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1408&view=rev
Author: jpgrayson
Date: 2008-04-15 15:20:42 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Print warning messages when portaudio reports audio under/overflow.
Modified Paths:
--------------
trunk/lib/audio_portaudio.c
Modified: trunk/lib/audio_portaudio.c
===================================================================
--- trunk/lib/audio_portaudio.c 2008-04-15 22:19:33 UTC (rev 1407)
+++ trunk/lib/audio_portaudio.c 2008-04-15 22:20:42 UTC (rev 1408)
@@ -212,7 +212,6 @@
static void mono2stereo(SAMPLE *out, SAMPLE *in, int nSamples)
{
int i;
- //fprintf(stderr, "mono2stereo: %d samples\n", nSamples);
for ( i=0; i < nSamples; i++ )
{
*(out++) = *in;
@@ -223,12 +222,11 @@
static void stereo2mono(SAMPLE *out, SAMPLE *in, int nSamples)
{
int i;
- //fprintf(stderr, "stereo2mono: %d samples\n", nSamples);
for ( i=0; i < nSamples; i++ )
{
*(out) = *(in++);
- out++; in++;
- //*(out++) += *(in++);
+ out++;
+ in++;
}
}
@@ -262,7 +260,8 @@
}
}
-static int pa_mix_sounds (void *outputBuffer, unsigned long frames, int channel, int virtualMono)
+static int pa_mix_sounds (void *outputBuffer, unsigned long frames,
+ int channel, int virtualMono)
{
struct iaxc_sound *s;
struct iaxc_sound **sp;
@@ -470,30 +469,43 @@
exit(1);
}
#endif
+ if ( statusFlags & paOutputUnderflow )
+ fprintf(stderr, "WARNING: Output Underflow detected\n");
+ if ( statusFlags & paInputUnderflow )
+ fprintf(stderr, "WARNING: Input Underflow detected\n");
+ if ( statusFlags & paOutputOverflow )
+ fprintf(stderr, "WARNING: Output Overflow detected\n");
+ if ( statusFlags & paInputOverflow )
+ fprintf(stderr, "WARNING: Input Overflow detected\n");
if ( outputBuffer )
{
int bWritten;
/* output underflow might happen here */
- if (virtualMonoOut)
+ if ( virtualMonoOut )
{
bWritten = rb_ReadRingBuffer(&outRing, virtualOutBuffer,
totBytes);
- /* we zero "virtualOutBuffer", then convert the whole thing,
- * yes, because we use virtualOutBuffer for ec below */
+
+ /* we zero "virtualOutBuffer", then convert the whole
+ * thing, yes, because we use virtualOutBuffer for ec
+ * below */
if ( bWritten < totBytes )
{
- memset(((char *)virtualOutBuffer) + bWritten,
- 0, totBytes - bWritten);
+ memset((char *)virtualOutBuffer + bWritten, 0,
+ totBytes - bWritten);
//fprintf(stderr, "*U*");
}
+
mono2stereo((SAMPLE *)outputBuffer, virtualOutBuffer,
samplesPerFrame);
}
else
{
- bWritten = rb_ReadRingBuffer(&outRing, outputBuffer, totBytes);
- if ( bWritten < totBytes)
+ bWritten = rb_ReadRingBuffer(&outRing, outputBuffer,
+ totBytes);
+
+ if ( bWritten < totBytes )
{
memset((char *)outputBuffer + bWritten,
0, totBytes - bWritten);
@@ -506,8 +518,9 @@
pa_mix_sounds(outputBuffer, samplesPerFrame, 0, virtualMonoOut);
- if(!auxStream)
- pa_mix_sounds(outputBuffer, samplesPerFrame, 1, virtualMonoOut);
+ if ( !auxStream )
+ pa_mix_sounds(outputBuffer, samplesPerFrame, 1,
+ virtualMonoOut);
}
@@ -696,7 +709,7 @@
ring_stream_params.hostApiSpecificStreamInfo = NULL;
// first we'll try mono
- ring_stream_params.channelCount = 1;
+ ring_stream_params.channelCount = 1;
err = Pa_OpenStream(&aStream,
NULL,
@@ -710,7 +723,7 @@
if ( err != paNoError )
{
// next we'll try virtual mono (stereo)
- ring_stream_params.channelCount = 1;
+ ring_stream_params.channelCount = 1;
err = Pa_OpenStream(&aStream,
NULL,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:19:30
|
Revision: 1407
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1407&view=rev
Author: jpgrayson
Date: 2008-04-15 15:19:33 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Print a message when video is captured without a video format been established for the call.
Modified Paths:
--------------
trunk/lib/video.c
Modified: trunk/lib/video.c
===================================================================
--- trunk/lib/video.c 2008-04-15 22:18:13 UTC (rev 1406)
+++ trunk/lib/video.c 2008-04-15 22:19:33 UTC (rev 1407)
@@ -676,6 +676,8 @@
if ( call->vformat == 0 )
{
+ fprintf(stderr, "video format not set for call %d\n",
+ selected_call);
goto callback_failed;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:18:06
|
Revision: 1406
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1406&view=rev
Author: jpgrayson
Date: 2008-04-15 15:18:13 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Whitespace.
Modified Paths:
--------------
trunk/lib/libiax2/src/iax.c
Modified: trunk/lib/libiax2/src/iax.c
===================================================================
--- trunk/lib/libiax2/src/iax.c 2008-04-15 22:17:47 UTC (rev 1405)
+++ trunk/lib/libiax2/src/iax.c 2008-04-15 22:18:13 UTC (rev 1406)
@@ -857,9 +857,9 @@
if (ntohs(h->scallno) & IAX_FLAG_FULL)
iax_showframe(f, NULL, 0, f->transfer ?
- &(f->session->transfer) :
- &(f->session->peeraddr),
- f->datalen - sizeof(struct ast_iax2_full_hdr));
+ &(f->session->transfer) :
+ &(f->session->peeraddr),
+ f->datalen - sizeof(struct ast_iax2_full_hdr));
}
#endif
/* Send the frame raw */
@@ -1425,7 +1425,6 @@
int transfer_id = 1 + (int)(32767.0 * (iax_random() / (RAND_MAX + 1.0)));
memset(&ied0, 0, sizeof(ied0));
-
memset(&ied1, 0, sizeof(ied1));
/* reversed setup */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:17:42
|
Revision: 1405
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1405&view=rev
Author: jpgrayson
Date: 2008-04-15 15:17:47 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Cleanup public versus static interfaces in file module.
Other syntactic tidiness.
Modified Paths:
--------------
trunk/simpleclient/stresstest/file.c
trunk/simpleclient/stresstest/file.h
Modified: trunk/simpleclient/stresstest/file.c
===================================================================
--- trunk/simpleclient/stresstest/file.c 2008-04-15 22:16:27 UTC (rev 1404)
+++ trunk/simpleclient/stresstest/file.c 2008-04-15 22:17:47 UTC (rev 1405)
@@ -3,16 +3,51 @@
#include <stdio.h>
#include "file.h"
+#include <oggz/oggz.h>
+#include <theora/theora.h>
+
#ifdef __GNUC__
void mylog(const char * fmt, ...) __attribute__ ((format (printf, 1, 2)));
#else
void mylog(const char * fmt, ...);
#endif
+#define THEORA_FRAME_DURATION 1000 / 15
+
+struct op_node
+{
+ ogg_packet *op;
+ long serialno;
+ long timestamp;
+ struct op_node *next;
+};
+
+struct theora_headers
+{
+ theora_info ti;
+ theora_comment tc;
+ theora_state ts;
+ int header_count;
+ int have_headers;
+};
+
+struct ogg_stream
+{
+ struct op_node *first;
+ struct op_node *last;
+ struct op_node *current;
+ long serialno;
+ long page_ts;
+ long page_count;
+ long base_ts;
+ void *data;
+};
+
static struct ogg_stream *audio_stream;
static struct ogg_stream *video_stream;
-struct op_node * create_node(ogg_packet *op, long serialno, long timestamp)
+static struct op_node *
+create_node(ogg_packet *op, long serialno, long timestamp)
{
struct op_node *node;
@@ -27,7 +62,8 @@
return node;
}
-void append_node(struct ogg_stream *os, struct op_node *node)
+static void
+append_node(struct ogg_stream *os, struct op_node *node)
{
if ( os->first == NULL )
{
@@ -65,15 +101,13 @@
*
* To whoever came up with this convoluted scheme: please consider a change of careers.
*/
-int read_theora_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data)
+static int
+read_theora_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data)
{
struct op_node *node;
struct theora_headers *th;
long timestamp = 0;
- //mylog("Got theora packet, serialno=%d, size=%d, packetno=%lld, granulepos=%lld\n",
- // serialno, op->bytes, op->packetno, op->granulepos);
-
th = (struct theora_headers *)video_stream->data;
if ( theora_packet_isheader(op) )
@@ -98,7 +132,8 @@
if ( timestamp < 0 )
{
- timestamp = video_stream->page_ts + video_stream->page_count * THEORA_FRAME_DURATION;
+ timestamp = video_stream->page_ts +
+ video_stream->page_count * THEORA_FRAME_DURATION;
video_stream->page_count++;
} else
{
@@ -115,30 +150,29 @@
return 0;
}
-int read_speex_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data)
+static int
+read_speex_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data)
{
- struct op_node *node;
- long timestamp;
- static int cnt = 0;
+ static int cnt = 0;
+ const long timestamp = audio_stream->page_ts +
+ audio_stream->page_count * SPEEX_FRAME_DURATION;
- timestamp = audio_stream->page_ts + audio_stream->page_count * SPEEX_FRAME_DURATION;
audio_stream->page_count++;
cnt++;
- //mylog("Got speex packet, serialno=%ld, size=%ld, packetno=%lld, granulepos=%lld, timestamp=%ld\n",
- // serialno, op->bytes, op->packetno, op->granulepos, timestamp);
// Ignore the first two packets, they are headers
if ( cnt > 2 )
{
- node = create_node(op, serialno, timestamp);
+ struct op_node *node = create_node(op, serialno, timestamp);
append_node(audio_stream, node);
}
return 0;
}
-int read_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data)
+static int
+read_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data)
{
struct theora_headers *th;
@@ -147,12 +181,11 @@
if ( memcmp(op->packet, theoraId, strlen(theoraId)) == 0 )
{
- //mylog("Detected a Theora stream with serialno=%d\n", serialno);
oggz_set_read_callback(oggz, serialno, read_theora_cb, NULL);
video_stream->serialno = serialno;
// Initialize theora specific data fields
- th = (struct theora_headers *)calloc(1, sizeof(struct theora_headers));
+ th = calloc(1, sizeof(struct theora_headers));
theora_info_init(&(th->ti));
theora_comment_init(&(th->tc));
video_stream->data = th;
@@ -160,48 +193,37 @@
read_theora_cb(oggz, op, serialno, data);
} else if ( memcmp(op->packet, speexId, strlen(speexId)) == 0 )
{
- //mylog("Detected a Speex stream with serialno=%d\n", serialno);
oggz_set_read_callback(oggz, serialno, read_speex_cb, NULL);
audio_stream->serialno = serialno;
read_speex_cb(oggz, op, serialno, data);
} else
{
- mylog("Got unknown ogg packet, serialno=%d, size=%d, packetno=%d, granulepos=%d\n",
- serialno, op->bytes, op->packetno, op->granulepos);
+ mylog("Got unknown ogg packet, serialno=%d, size=%d, "
+ "packetno=%d, granulepos=%d\n",
+ serialno, op->bytes,
+ op->packetno, op->granulepos);
}
return 0;
}
-int read_page_cb(OGGZ *oggz, const ogg_page *og, long serialno, void *data)
+static int
+read_page_cb(OGGZ *oggz, const ogg_page *og, long serialno, void *data)
{
if ( serialno == audio_stream->serialno )
{
- audio_stream->page_ts = ogg_page_granulepos(og) * 1000 / SPEEX_SAMPLING_RATE;
+ audio_stream->page_ts = ogg_page_granulepos(og) * 1000 /
+ SPEEX_SAMPLING_RATE;
audio_stream->page_count = 0;
- } else if ( serialno == video_stream->serialno )
+ }
+ else if ( serialno == video_stream->serialno )
{
- //mylog("Got theora page serialno=%d, header_len=%d, body_len=%d, granulepos=%lld\n",
- // serialno, og->header_len, og->body_len, ogg_page_granulepos(og));
}
return 0;
}
-void dump_stream(struct ogg_stream *os)
+void
+load_ogg_file(const char *filename)
{
- struct op_node *node;
-
- node = os->first;
- while ( node != NULL )
- {
- mylog("Size=%ld, Stream=%ld, packetno=%lld, timestamp=%ld\n",
- node->op->bytes, node->serialno,
- node->op->packetno, node->timestamp);
- node = node->next;
- }
-}
-
-void load_ogg_file(const char *filename)
-{
OGGZ *oggz;
oggz = oggz_open(filename, OGGZ_READ | OGGZ_AUTO);
@@ -220,15 +242,10 @@
oggz_run(oggz);
- //mylog("Audio stream, serialno=%d\n", audio_stream->serialno);
- //dump_stream(audio_stream);
- //mylog("Video stream, serialno=%d\n", video_stream->serialno);
- //dump_stream(video_stream);
-
oggz_close(oggz);
}
-ogg_packet * get_next_op(struct ogg_stream *os)
+static ogg_packet * get_next_op(struct ogg_stream *os)
{
ogg_packet *op;
struct timeval tv;
Modified: trunk/simpleclient/stresstest/file.h
===================================================================
--- trunk/simpleclient/stresstest/file.h 2008-04-15 22:16:27 UTC (rev 1404)
+++ trunk/simpleclient/stresstest/file.h 2008-04-15 22:17:47 UTC (rev 1405)
@@ -1,48 +1,11 @@
#ifndef __FILE_H__
#define __FILE_H__
-#include <oggz/oggz.h>
-#include <theora/theora.h>
+#include <ogg/ogg.h>
#define SPEEX_FRAME_DURATION 20
#define SPEEX_SAMPLING_RATE 8000
-#define THEORA_FRAME_DURATION 1000 / 15
-
-// Struct used to build chains of packets for delivery
-struct op_node
-{
- ogg_packet *op;
- long serialno;
- long timestamp;
- struct op_node *next;
-};
-
-struct ogg_stream
-{
- struct op_node *first;
- struct op_node *last;
- struct op_node *current;
- long serialno;
- long page_ts;
- long page_count;
- long base_ts;
- void *data;
-};
-
-struct theora_headers
-{
- theora_info ti;
- theora_comment tc;
- theora_state ts;
- int header_count;
- int have_headers;
-};
-
-int read_theora_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data);
-int read_speex_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data);
-int read_cb(OGGZ *oggz, ogg_packet *op, long serialno, void *data);
-int read_page_cb(OGGZ *oggz, const ogg_page *og, long serialno, void *data);
void load_ogg_file(const char *filename);
ogg_packet * get_next_audio_op();
@@ -51,4 +14,4 @@
int audio_is_eos();
int video_is_eos();
-#endif // __FILE_H__
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:16:22
|
Revision: 1404
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1404&view=rev
Author: jpgrayson
Date: 2008-04-15 15:16:27 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Update Makefile.am for stresstest, testcall, and vtestcall to use variables from pkgconfig to get all of the appropriate compile and link flags.
Modified Paths:
--------------
trunk/simpleclient/stresstest/Makefile.am
trunk/simpleclient/testcall/Makefile.am
trunk/simpleclient/vtestcall/Makefile.am
Modified: trunk/simpleclient/stresstest/Makefile.am
===================================================================
--- trunk/simpleclient/stresstest/Makefile.am 2008-04-15 22:14:46 UTC (rev 1403)
+++ trunk/simpleclient/stresstest/Makefile.am 2008-04-15 22:16:27 UTC (rev 1404)
@@ -1,16 +1,20 @@
-bin_PROGRAMS=stresstest
-stresstest_SOURCES=stresstest.c file.c file.h
+bin_PROGRAMS = stresstest
-AM_CPPFLAGS=-I$(top_srcdir)/lib $(SDL_CFLAGS) $(OGGZ_CFLAGS) $(THEORA_CFLAGS)
-stresstest_LDADD=$(top_builddir)/lib/libiaxclient.la $(OGGZ_LIBS) $(THEORA_LIBS)
+stresstest_SOURCES = stresstest.c file.c file.h
-if MACOSX
-stresstest_LDFLAGS = \
- -framework AudioToolbox \
- -framework AudioUnit \
- -framework Carbon \
- -framework CoreAudio \
- -framework QuartzCore \
- -framework QuickTime
-endif
+stresstest_CPPFLAGS = -I$(top_srcdir)/lib
+stresstest_CFLAGS = $(OGGZ_CFLAGS) \
+ $(THEORA_CFLAGS) \
+ $(PORTAUDIO_CFLAGS) \
+ $(SPEEX_CFLAGS) \
+ $(VIDCAP_CFLAGS)
+stresstest_LDFLAGS =
+stresstest_LDADD = $(top_builddir)/lib/libiaxclient.la \
+ $(OGGZ_LIBS) \
+ $(THEORA_LIBS) \
+ $(PORTAUDIO_LIBS) \
+ $(SPEEX_LIBS) \
+ $(VIDCAP_LIBS)
+
+
Modified: trunk/simpleclient/testcall/Makefile.am
===================================================================
--- trunk/simpleclient/testcall/Makefile.am 2008-04-15 22:14:46 UTC (rev 1403)
+++ trunk/simpleclient/testcall/Makefile.am 2008-04-15 22:16:27 UTC (rev 1404)
@@ -1,11 +1,16 @@
-bin_PROGRAMS=testcall
-testcall_SOURCES=testcall.c
+bin_PROGRAMS = testcall
-AM_CPPFLAGS=-I$(top_srcdir)/lib
-LDADD=$(top_builddir)/lib/libiaxclient.la
+testcall_SOURCES = testcall.c
-if ! WIN32
-AM_CPPFLAGS += -DPOSIXSLEEP
+testcall_CPPFLAGS = -I$(top_srcdir)/lib
+testcall_CFLAGS = $(PORTAUDIO_CFLAGS) $(SPEEX_CFLAGS)
+testcall_LDFLAGS =
+testcall_LDADD = $(top_builddir)/lib/libiaxclient.la \
+ $(PORTAUDIO_LIBS) $(SPEEX_LIBS)
+
+if VIDEO
+testcall_CFLAGS += $(THEORA_CFLAGS) $(VIDCAP_CFLAGS)
+testcall_LDADD += $(THEORA_LIBS) $(VIDCAP_LIBS)
endif
EXTRA_DIST = testcall-jb.c
Modified: trunk/simpleclient/vtestcall/Makefile.am
===================================================================
--- trunk/simpleclient/vtestcall/Makefile.am 2008-04-15 22:14:46 UTC (rev 1403)
+++ trunk/simpleclient/vtestcall/Makefile.am 2008-04-15 22:16:27 UTC (rev 1404)
@@ -1,7 +1,21 @@
-bin_PROGRAMS=vtestcall
-vtestcall_SOURCES=vtestcall.c
+bin_PROGRAMS = vtestcall
+vtestcall_SOURCES = vtestcall.c
-AM_CPPFLAGS=-I$(top_srcdir)/lib $(SDL_CFLAGS) $(OGGZ_CFLAGS)
-vtestcall_LDADD=$(top_builddir)/lib/libiaxclient.la $(SDL_LIBS) $(OGGZ_LIBS)
+vtestcall_CPPFLAGS = -I$(top_srcdir)/lib
+vtestcall_CFLAGS = $(SDL_CFLAGS) \
+ $(OGGZ_CFLAGS) \
+ $(PORTAUDIO_CFLAGS) \
+ $(SPEEX_CFLAGS) \
+ $(THEORA_CFLAGS) \
+ $(VIDCAP_CFLAGS)
+vtestcall_LDADD = $(top_builddir)/lib/libiaxclient.la \
+ $(SDL_LIBS) \
+ $(OGGZ_LIBS) \
+ $(PORTAUDIO_LIBS) \
+ $(SPEEX_LIBS) \
+ $(THEORA_LIBS) \
+ $(VIDCAP_LIBS)
+
EXTRA_DIST =
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:14:42
|
Revision: 1403
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1403&view=rev
Author: jpgrayson
Date: 2008-04-15 15:14:46 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Add files to speex build required for use of the speex resampler.
Modified Paths:
--------------
trunk/contrib/win/vs2005/libspeex.vcproj
Modified: trunk/contrib/win/vs2005/libspeex.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libspeex.vcproj 2008-04-15 22:13:27 UTC (rev 1402)
+++ trunk/contrib/win/vs2005/libspeex.vcproj 2008-04-15 22:14:46 UTC (rev 1403)
@@ -274,6 +274,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\speex\libspeex\resample.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\speex\libspeex\sb_celp.c"
>
</File>
@@ -328,6 +332,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\speex\libspeex\filterbank.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\speex\libspeex\filters.h"
>
</File>
@@ -416,6 +424,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\speex\include\speex\speex_resampler.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\speex\include\speex\speex_stereo.h"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-15 22:13:21
|
Revision: 1402
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1402&view=rev
Author: jpgrayson
Date: 2008-04-15 15:13:27 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
Make the AM_CONDITIONAL also be conditional on the "with_xxx". The primary benefit of this change is that --without-ffmpeg will work as expected even if libavcodec.pc and friends are installed on your system.
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-04-07 16:07:39 UTC (rev 1401)
+++ trunk/configure.ac 2008-04-15 22:13:27 UTC (rev 1402)
@@ -350,10 +350,10 @@
fi
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(OGG, test x$has_ogg = xyes && test x$with_ogg != xno)
+AM_CONDITIONAL(THEORA, test x$has_theora = xyes && test x$with_theora != xno)
+AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes && test x$with_vidcap != xno)
+AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes && test x$with_ffmpeg != xno)
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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-07 16:07:33
|
Revision: 1401
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1401&view=rev
Author: jpgrayson
Date: 2008-04-07 09:07:39 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Update package and libtool versions for iaxclient-2.1beta3.
Modified Paths:
--------------
tags/2.1beta3/configure.ac
Modified: tags/2.1beta3/configure.ac
===================================================================
--- tags/2.1beta3/configure.ac 2008-04-07 16:04:57 UTC (rev 1400)
+++ tags/2.1beta3/configure.ac 2008-04-07 16:07:39 UTC (rev 1401)
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
dnl Package version
-m4_define(IAXC_VERSION, [2.1-svn])
+m4_define(IAXC_VERSION, [2.1beta3])
AC_INIT(iaxclient, IAXC_VERSION, [iax...@li...])
@@ -15,7 +15,7 @@
dnl Libtool library version
IAXC_LT_CURRENT=1
-IAXC_LT_REVISION=1
+IAXC_LT_REVISION=2
IAXC_LT_AGE=0
AC_SUBST(IAXC_LT_CURRENT)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-07 16:04:50
|
Revision: 1400
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1400&view=rev
Author: jpgrayson
Date: 2008-04-07 09:04:57 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Tag iaxclient-2.1beta3.
Added Paths:
-----------
tags/2.1beta3/
Copied: tags/2.1beta3 (from rev 1399, branches/2.1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-07 16:01:56
|
Revision: 1399
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1399&view=rev
Author: jpgrayson
Date: 2008-04-07 09:01:53 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Merge revisions 1389:1398 from trunk into the 2.1 branch.
- Add Visual Studio project and solution for iaxcomm.
- Fix 'make dist'.
- Fix to make iaxc_version() (an API function) always defined.
- Add novideo VS2005 configurations.
- Numerous fixes to VS2005 projects.
Modified Paths:
--------------
branches/2.1/Makefile.am
branches/2.1/contrib/win/vs2005/iaxclient.sln
branches/2.1/contrib/win/vs2005/libiaxclient.vcproj
branches/2.1/contrib/win/vs2005/testcall.vcproj
branches/2.1/contrib/win/vs2005/vtestcall.vcproj
branches/2.1/lib/iaxclient_lib.c
branches/2.1/simpleclient/iaxcomm/Makefile.am
branches/2.1/simpleclient/iaxcomm/prefs.cc
branches/2.1/simpleclient/vtestcall/Makefile.am
Added Paths:
-----------
branches/2.1/simpleclient/iaxcomm/iaxcomm.sln
branches/2.1/simpleclient/iaxcomm/iaxcomm.vcproj
Modified: branches/2.1/Makefile.am
===================================================================
--- branches/2.1/Makefile.am 2008-04-07 15:55:54 UTC (rev 1398)
+++ branches/2.1/Makefile.am 2008-04-07 16:01:53 UTC (rev 1399)
@@ -12,6 +12,8 @@
README.VisualStudio \
autogen.sh \
contrib \
+ doc \
+ Doxyfile \
m4
dist-hook:
Modified: branches/2.1/contrib/win/vs2005/iaxclient.sln
===================================================================
--- branches/2.1/contrib/win/vs2005/iaxclient.sln 2008-04-07 15:55:54 UTC (rev 1398)
+++ branches/2.1/contrib/win/vs2005/iaxclient.sln 2008-04-07 16:01:53 UTC (rev 1399)
@@ -7,13 +7,12 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiaxclient", "libiaxclient.vcproj", "{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}"
ProjectSection(ProjectDependencies) = postProject
+ {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}
+ {3A76129B-55AB-4D54-BAA7-08F63ED52569} = {3A76129B-55AB-4D54-BAA7-08F63ED52569}
{82C9BD79-9796-405F-8A28-3F538514AC3A} = {82C9BD79-9796-405F-8A28-3F538514AC3A}
- {3A76129B-55AB-4D54-BAA7-08F63ED52569} = {3A76129B-55AB-4D54-BAA7-08F63ED52569}
- {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}
- {2F463562-375D-481E-A6E0-7C7D0DC1ED7A} = {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}
- {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
{E2C6AD95-7A61-41FE-8754-A4623C891BF8} = {E2C6AD95-7A61-41FE-8754-A4623C891BF8}
{F5166D99-32BB-40D5-BE95-6F97F72C44CE} = {F5166D99-32BB-40D5-BE95-6F97F72C44CE}
+ {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
{3B023516-2C69-4CCB-9302-239991B6EC2C} = {3B023516-2C69-4CCB-9302-239991B6EC2C}
EndProjectSection
EndProject
@@ -26,8 +25,14 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libspeex.vcproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora", "libtheora.vcproj", "{E2C6AD95-7A61-41FE-8754-A4623C891BF8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2F463562-375D-481E-A6E0-7C7D0DC1ED7A} = {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testcall", "testcall.vcproj", "{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9A9C003E-EAF6-4D0E-896F-E3994503C7E4} = {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtestcall", "vtestcall.vcproj", "{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}"
ProjectSection(ProjectDependencies) = postProject
@@ -39,139 +44,173 @@
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_dll|Win32 = Debug_dll|Win32
+ Debug_novideo_dll|Win32 = Debug_novideo_dll|Win32
Debug_novideo|Win32 = Debug_novideo|Win32
Debug|Win32 = Debug|Win32
Release_dll|Win32 = Release_dll|Win32
+ Release_novideo_dll|Win32 = Release_novideo_dll|Win32
Release_novideo|Win32 = Release_novideo|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_dll|Win32.ActiveCfg = Debug|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32
+ {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug_novideo|Win32.Build.0 = Debug|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug|Win32.ActiveCfg = Debug|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug|Win32.Build.0 = Debug|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_dll|Win32.ActiveCfg = Release|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_dll|Win32.Build.0 = Release|Win32
+ {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
+ {3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_novideo_dll|Win32.Build.0 = Release|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_novideo|Win32.ActiveCfg = Release|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release_novideo|Win32.Build.0 = Release|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release|Win32.ActiveCfg = Release|Win32
{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release|Win32.Build.0 = Release|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_dll|Win32.ActiveCfg = Debug|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32
+ {3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug_novideo|Win32.Build.0 = Debug|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug|Win32.ActiveCfg = Debug|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Debug|Win32.Build.0 = Debug|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_dll|Win32.ActiveCfg = Release|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_dll|Win32.Build.0 = Release|Win32
+ {3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
+ {3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_novideo_dll|Win32.Build.0 = Release|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_novideo|Win32.ActiveCfg = Release|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release_novideo|Win32.Build.0 = Release|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release|Win32.ActiveCfg = Release|Win32
{3B023516-2C69-4CCB-9302-239991B6EC2C}.Release|Win32.Build.0 = Release|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_dll|Win32.Build.0 = Debug_dll|Win32
+ {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_novideo_dll|Win32.ActiveCfg = Debug_novideo_dll|Win32
+ {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_novideo_dll|Win32.Build.0 = Debug_novideo_dll|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_novideo|Win32.ActiveCfg = Debug_novideo|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug_novideo|Win32.Build.0 = Debug_novideo|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug|Win32.ActiveCfg = Debug|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Debug|Win32.Build.0 = Debug|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_dll|Win32.ActiveCfg = Release_dll|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_dll|Win32.Build.0 = Release_dll|Win32
+ {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_novideo_dll|Win32.ActiveCfg = Release_novideo_dll|Win32
+ {9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_novideo_dll|Win32.Build.0 = Release_novideo_dll|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_novideo|Win32.ActiveCfg = Release_novideo|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release_novideo|Win32.Build.0 = Release_novideo|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release|Win32.ActiveCfg = Release|Win32
{9A9C003E-EAF6-4D0E-896F-E3994503C7E4}.Release|Win32.Build.0 = Release|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_dll|Win32.ActiveCfg = Debug|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32
+ {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug_novideo|Win32.Build.0 = Debug|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.ActiveCfg = Debug|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Debug|Win32.Build.0 = Debug|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_dll|Win32.ActiveCfg = Release|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_dll|Win32.Build.0 = Release|Win32
+ {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
+ {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_novideo_dll|Win32.Build.0 = Release|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_novideo|Win32.ActiveCfg = Release|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release_novideo|Win32.Build.0 = Release|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.ActiveCfg = Release|Win32
{5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}.Release|Win32.Build.0 = Release|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_dll|Win32.ActiveCfg = Debug|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32
+ {82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug_novideo|Win32.Build.0 = Debug|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug|Win32.ActiveCfg = Debug|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Debug|Win32.Build.0 = Debug|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_dll|Win32.ActiveCfg = Release|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_dll|Win32.Build.0 = Release|Win32
+ {82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
+ {82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_novideo_dll|Win32.Build.0 = Release|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_novideo|Win32.ActiveCfg = Release|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release_novideo|Win32.Build.0 = Release|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release|Win32.ActiveCfg = Release|Win32
{82C9BD79-9796-405F-8A28-3F538514AC3A}.Release|Win32.Build.0 = Release|Win32
{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_dll|Win32.ActiveCfg = Debug|Win32
{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32
{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug|Win32.ActiveCfg = Debug|Win32
{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Debug|Win32.Build.0 = Debug|Win32
{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_dll|Win32.ActiveCfg = Release|Win32
{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_dll|Win32.Build.0 = Release|Win32
+ {2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release_novideo|Win32.ActiveCfg = Release|Win32
{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release|Win32.ActiveCfg = Release|Win32
{2F463562-375D-481E-A6E0-7C7D0DC1ED7A}.Release|Win32.Build.0 = Release|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_dll|Win32.ActiveCfg = Debug|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32
+ {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_novideo|Win32.Build.0 = Debug|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.ActiveCfg = Debug|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.Build.0 = Debug|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_dll|Win32.ActiveCfg = Release|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_dll|Win32.Build.0 = Release|Win32
+ {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
+ {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_novideo_dll|Win32.Build.0 = Release|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_novideo|Win32.ActiveCfg = Release|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_novideo|Win32.Build.0 = Release|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.ActiveCfg = Release|Win32
{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.Build.0 = Release|Win32
{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_dll|Win32.ActiveCfg = Debug|Win32
{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32
{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug|Win32.ActiveCfg = Debug|Win32
{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Debug|Win32.Build.0 = Debug|Win32
{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_dll|Win32.ActiveCfg = Release|Win32
{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_dll|Win32.Build.0 = Release|Win32
+ {E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release_novideo|Win32.ActiveCfg = Release|Win32
{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release|Win32.ActiveCfg = Release|Win32
{E2C6AD95-7A61-41FE-8754-A4623C891BF8}.Release|Win32.Build.0 = Release|Win32
- {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_dll|Win32.ActiveCfg = Debug|Win32
- {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32
+ {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_dll|Win32.Build.0 = Debug_dll|Win32
+ {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_novideo_dll|Win32.ActiveCfg = Debug_novideo_dll|Win32
+ {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_novideo_dll|Win32.Build.0 = Debug_novideo_dll|Win32
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_novideo|Win32.ActiveCfg = Debug_novideo|Win32
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug_novideo|Win32.Build.0 = Debug_novideo|Win32
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug|Win32.ActiveCfg = Debug|Win32
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Debug|Win32.Build.0 = Debug|Win32
- {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_dll|Win32.ActiveCfg = Release|Win32
- {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_dll|Win32.Build.0 = Release|Win32
+ {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_dll|Win32.ActiveCfg = Release_dll|Win32
+ {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_dll|Win32.Build.0 = Release_dll|Win32
+ {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo_dll|Win32.ActiveCfg = Release_novideo_dll|Win32
+ {6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo_dll|Win32.Build.0 = Release_novideo_dll|Win32
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo|Win32.ActiveCfg = Release_novideo|Win32
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo|Win32.Build.0 = Release_novideo|Win32
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release|Win32.ActiveCfg = Release|Win32
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release|Win32.Build.0 = Release|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.ActiveCfg = Debug|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.Build.0 = Debug_dll|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.Build.0 = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug|Win32.ActiveCfg = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug|Win32.Build.0 = Debug|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.ActiveCfg = Release|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.Build.0 = Release|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.ActiveCfg = Release_dll|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.Build.0 = Release_dll|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.ActiveCfg = Release|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.Build.0 = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.ActiveCfg = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.Build.0 = Release|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.ActiveCfg = Debug|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
- {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_novideo|Win32.Build.0 = Debug|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug|Win32.ActiveCfg = Debug|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug|Win32.Build.0 = Debug|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_dll|Win32.ActiveCfg = Release|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_dll|Win32.Build.0 = Release|Win32
+ {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_novideo|Win32.ActiveCfg = Release|Win32
- {F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release_novideo|Win32.Build.0 = Release|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release|Win32.ActiveCfg = Release|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
Modified: branches/2.1/contrib/win/vs2005/libiaxclient.vcproj
===================================================================
--- branches/2.1/contrib/win/vs2005/libiaxclient.vcproj 2008-04-07 15:55:54 UTC (rev 1398)
+++ branches/2.1/contrib/win/vs2005/libiaxclient.vcproj 2008-04-07 16:01:53 UTC (rev 1399)
@@ -16,7 +16,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
CharacterSet="2"
@@ -80,7 +80,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
CharacterSet="2"
@@ -143,7 +143,7 @@
</Configuration>
<Configuration
Name="Release_dll|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="2"
CharacterSet="2"
@@ -185,6 +185,7 @@
/>
<Tool
Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
AdditionalDependencies="libiax2.lib libvidcap.lib libportmixer.lib libportaudio.lib libgsm.lib libogg.lib libspeex.lib libtheora.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib"
AdditionalLibraryDirectories=""$(SolutionDir)Release\libiax2";"$(SolutionDir)Release\libvidcap";"$(SolutionDir)Release\libportaudio";"$(SolutionDir)Release\libportmixer";"$(SolutionDir)Release\libogg";"$(SolutionDir)Release\libtheora";"$(SolutionDir)Release\libspeex";"$(SolutionDir)Release\libgsm""
/>
@@ -215,8 +216,8 @@
</Configuration>
<Configuration
Name="Debug_dll|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
ConfigurationType="2"
CharacterSet="2"
>
@@ -258,6 +259,7 @@
/>
<Tool
Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
AdditionalDependencies="libiax2.lib libvidcap.lib libportmixer.lib libportaudio.lib libgsm.lib libogg.lib libspeex.lib libtheora.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib"
AdditionalLibraryDirectories=""$(SolutionDir)Debug\libiax2";"$(SolutionDir)Debug\libvidcap";"$(SolutionDir)Debug\libportaudio";"$(SolutionDir)Debug\libportmixer";"$(SolutionDir)Debug\libogg";"$(SolutionDir)Debug\libtheora";"$(SolutionDir)Debug\libspeex";"$(SolutionDir)Debug\libgsm""
/>
@@ -288,7 +290,7 @@
</Configuration>
<Configuration
Name="Release_novideo|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
CharacterSet="2"
@@ -351,7 +353,7 @@
</Configuration>
<Configuration
Name="Debug_novideo|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
CharacterSet="2"
@@ -413,6 +415,153 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Release_novideo_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\lib\portmixer\px_common"
+ PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;CODEC_GSM"
+ RuntimeLibrary="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="libiax2.lib libportmixer.lib libportaudio.lib libgsm.lib libspeex.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib"
+ AdditionalLibraryDirectories=""$(SolutionDir)Release\libiax2";"$(SolutionDir)Release\libportaudio";"$(SolutionDir)Release\libportmixer";"$(SolutionDir)Release\libspeex";"$(SolutionDir)Release\libgsm""
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_novideo_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\lib\portmixer\px_common"
+ PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;CODEC_GSM"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="libiax2.lib libportmixer.lib libportaudio.lib libgsm.lib libspeex.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib"
+ AdditionalLibraryDirectories=""$(SolutionDir)Debug\libiax2";"$(SolutionDir)Debug\libportaudio";"$(SolutionDir)Debug\libportmixer";"$(SolutionDir)Debug\libspeex";"$(SolutionDir)Debug\libgsm""
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -461,6 +610,22 @@
Name="VCCLCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release_novideo_dll|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_novideo_dll|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\lib\codec_ulaw.c"
@@ -521,6 +686,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release_novideo_dll|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_novideo_dll|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\lib\ringbuffer.c"
@@ -549,6 +730,22 @@
Name="VCCLCompilerTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release_novideo_dll|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_novideo_dll|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\lib\winfuncs.c"
@@ -611,6 +808,22 @@
Name="VCCustomBuildTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release_novideo_dll|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_novideo_dll|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\lib\codec_ulaw.h"
@@ -651,6 +864,22 @@
Name="VCCustomBuildTool"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release_novideo_dll|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_novideo_dll|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
</File>
</Filter>
<Filter
Modified: branches/2.1/contrib/win/vs2005/testcall.vcproj
===================================================================
--- branches/2.1/contrib/win/vs2005/testcall.vcproj 2008-04-07 15:55:54 UTC (rev 1398)
+++ branches/2.1/contrib/win/vs2005/testcall.vcproj 2008-04-07 16:01:53 UTC (rev 1399)
@@ -61,6 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
AdditionalDependencies="libiaxclient.lib ws2_32.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient"
@@ -139,6 +140,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="false"
+ LinkLibraryDependencies="false"
AdditionalDependencies="libiaxclient.lib ws2_32.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient"
@@ -176,8 +178,8 @@
</Configuration>
<Configuration
Name="Release_novideo|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -219,6 +221,7 @@
<Tool
Name="VCLinkerTool"
IgnoreImportLibrary="false"
+ LinkLibraryDependencies="false"
AdditionalDependencies="libiaxclient.lib ws2_32.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient"
@@ -256,8 +259,8 @@
</Configuration>
<Configuration
Name="Debug_novideo|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
ConfigurationType="1"
CharacterSet="2"
>
@@ -300,6 +303,7 @@
/>
<Tool
Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
AdditionalDependencies="libiaxclient.lib ws2_32.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient"
@@ -333,6 +337,332 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Release_novideo_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\lib"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="false"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="libiaxclient.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_novideo_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\lib"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="libiaxclient.lib ws2_32.lib"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient"
+ IgnoreDefaultLibraryNames="libcmtd.lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\lib"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="false"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="libiaxclient.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\lib"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="libiaxclient.lib ws2_32.lib"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="$(SolutionDir)$(ConfigurationName)\libiaxclient"
+ IgnoreDefaultLibraryNames="libcmtd.lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
Modified: branches/2.1/contrib/win/vs2005/vtestcall.vcproj
===================================================================
--- branches/2.1/contrib/win/vs2005/vtestcall.vcproj 2008-04-07 15:55:54 UTC (rev 1398)
+++ branches/2.1/contrib/win/vs2005/vtestcall.vcproj 2008-04-07 16:01:53 UTC (rev 1399)
@@ -174,6 +174,167 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Debug_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\lib;..\..\..\..\SDL\include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="false"
+ AdditionalDependencies="libiaxclient.lib SDL.lib wsock32.lib winmm.lib strmiids.lib"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories=""$(DXSDK_DIR)\lib\x86";..\..\..\..\SDL\lib;$(SolutionDir)$(ConfigurationName)\libiaxclient"
+ IgnoreDefaultLibraryNames="libcmtd.lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\lib;..\..\..\..\SDL\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
+ RuntimeLibrary="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="false"
+ AdditionalDependencies="libiaxclient.lib SDL.lib wsock32.lib winmm.lib strmiids.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\..\..\SDL\lib;$(SolutionDir)$(ConfigurationName)\libiaxclient"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
Modified: branches/2.1/lib/iaxclient_lib.c
===================================================================
--- branches/2.1/lib/iaxclient_lib.c 2008-04-07 15:55:54 UTC (rev 1398)
+++ branches/2.1/lib/iaxclient_lib.c 2008-04-07 16:01:53 UTC (rev 1399)
@@ -1910,13 +1910,14 @@
return audio_driver.mic_boost_set( &audio_driver, enable ) ;
}
-#ifdef LIBVER
EXPORT char* iaxc_version(char * ver)
{
+#ifndef LIBVER
+#define LIBVER ""
+#endif
strncpy(ver, LIBVER, IAXC_EVENT_BUFSIZ);
return ver;
}
-#endif
EXPORT unsigned int iaxc_get_audio_prefs(void)
{
Modified: branches/2.1/simpleclient/iaxcomm/Makefile.am
===================================================================
--- branches/2.1/simpleclient/iaxcomm/Makefile.am 2008-04-07 15:55:54 UTC (rev 1398)
+++ branches/2.1/simpleclient/iaxcomm/Makefile.am 2008-04-07 16:01:53 UTC (rev 1399)
@@ -85,4 +85,4 @@
endif MACOSX
-EXTRA_DIST = QUICKSTART ring.raw iaxcomm.icns
+EXTRA_DIST = QUICKSTART ring.raw iaxcomm.icns iaxcomm.sln iaxcomm.vcproj
Copied: branches/2.1/simpleclient/iaxcomm/iaxcomm.sln (from rev 1397, trunk/simpleclient/iaxcomm/iaxcomm.sln)
===================================================================
--- branches/2.1/simpleclient/iaxcomm/iaxcomm.sln (rev 0)
+++ branches/2.1/simpleclient/iaxcomm/iaxcomm.sln 2008-04-07 16:01:53 UTC (rev 1399)
@@ -0,0 +1,38 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iaxcomm", "iaxcomm.vcproj", "{3856417E-2A25-4094-A7E2-38AE64719ECA}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug_dll|Win32 = Debug_dll|Win32
+ Debug_novideo_dll|Win32 = Debug_novideo_dll|Win32
+ Debug_novideo|Win32 = Debug_novideo|Win32
+ Debug|Win32 = Debug|Win32
+ Release_dll|Win32 = Release_dll|Win32
+ Release_novideo_dll|Win32 = Release_novideo_dll|Win32
+ Release_novideo|Win32 = Release_novideo|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_dll|Win32.Build.0 = Debug_dll|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_novideo_dll|Win32.ActiveCfg = Debug_novideo_dll|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_novideo_dll|Win32.Build.0 = Debug_novideo_dll|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_novideo|Win32.ActiveCfg = Debug_novideo|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug_novideo|Win32.Build.0 = Debug_novideo|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Debug|Win32.Build.0 = Debug|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_dll|Win32.ActiveCfg = Release_dll|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_dll|Win32.Build.0 = Release_dll|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_novideo_dll|Win32.ActiveCfg = Release_novideo_dll|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_novideo_dll|Win32.Build.0 = Release_novideo_dll|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_novideo|Win32.ActiveCfg = Release_novideo|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release_novideo|Win32.Build.0 = Release_novideo|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release|Win32.ActiveCfg = Release|Win32
+ {3856417E-2A25-4094-A7E2-38AE64719ECA}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Copied: branches/2.1/simpleclient/iaxcomm/iaxcomm.vcproj (from rev 1397, trunk/simpleclient/iaxcomm/iaxcomm.vcproj)
===================================================================
--- branches/2.1/simpleclient/iaxcomm/iaxcomm.vcproj (rev 0)
+++ branches/2.1/simpleclient/iaxcomm/iaxcomm.vcproj 2008-04-07 16:01:53 UTC (rev 1399)
@@ -0,0 +1,754 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="iaxcomm"
+ ProjectGUID="{3856417E-2A25-4094-A7E2-38AE64719ECA}"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ AssemblerOutput="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy ..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ AssemblerOutput="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy ..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_novideo|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ AssemblerOutput="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_novideo_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ AssemblerOutput="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy ..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_novideo|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\r...
[truncated message content] |
|
From: <jpg...@us...> - 2008-04-07 15:56:02
|
Revision: 1398
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1398&view=rev
Author: jpgrayson
Date: 2008-04-07 08:55:54 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Add new vcproj and sln files to EXTRA_DIST.
Modified Paths:
--------------
trunk/simpleclient/iaxcomm/Makefile.am
Modified: trunk/simpleclient/iaxcomm/Makefile.am
===================================================================
--- trunk/simpleclient/iaxcomm/Makefile.am 2008-04-07 15:31:56 UTC (rev 1397)
+++ trunk/simpleclient/iaxcomm/Makefile.am 2008-04-07 15:55:54 UTC (rev 1398)
@@ -85,4 +85,4 @@
endif MACOSX
-EXTRA_DIST = QUICKSTART ring.raw iaxcomm.icns
+EXTRA_DIST = QUICKSTART ring.raw iaxcomm.icns iaxcomm.sln iaxcomm.vcproj
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-07 15:37:58
|
Revision: 1396
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1396&view=rev
Author: jpgrayson
Date: 2008-04-07 08:27:20 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
VS2005 build fixes from stevebvt. Thank you!
- Copy libiaxclient.dll files to output directories of testcall and vtestcall so those programs can run easily.
- Fix library search paths for debug iaxclient.
- Add Debug_dll configuration for vtestcall.
Modified Paths:
--------------
trunk/contrib/win/vs2005/iaxclient.sln
trunk/contrib/win/vs2005/libiaxclient.vcproj
trunk/contrib/win/vs2005/testcall.vcproj
trunk/contrib/win/vs2005/vtestcall.vcproj
Modified: trunk/contrib/win/vs2005/iaxclient.sln
===================================================================
--- trunk/contrib/win/vs2005/iaxclient.sln 2008-04-04 21:37:07 UTC (rev 1395)
+++ trunk/contrib/win/vs2005/iaxclient.sln 2008-04-07 15:27:20 UTC (rev 1396)
@@ -189,20 +189,16 @@
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release_novideo|Win32.Build.0 = Release_novideo|Win32
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release|Win32.ActiveCfg = Release|Win32
{6F5AEE93-BA87-465B-BC75-C41C434FC4E4}.Release|Win32.Build.0 = Release|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.ActiveCfg = Debug|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.Build.0 = Debug|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.ActiveCfg = Debug_dll|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_dll|Win32.Build.0 = Debug_dll|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo_dll|Win32.ActiveCfg = Debug|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.Build.0 = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug|Win32.ActiveCfg = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug|Win32.Build.0 = Debug|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.ActiveCfg = Release|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.Build.0 = Release|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.ActiveCfg = Release_dll|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.Build.0 = Release_dll|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo_dll|Win32.Build.0 = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.ActiveCfg = Release|Win32
- {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.Build.0 = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.ActiveCfg = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.Build.0 = Release|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.ActiveCfg = Debug|Win32
Modified: trunk/contrib/win/vs2005/libiaxclient.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libiaxclient.vcproj 2008-04-04 21:37:07 UTC (rev 1395)
+++ trunk/contrib/win/vs2005/libiaxclient.vcproj 2008-04-07 15:27:20 UTC (rev 1396)
@@ -535,7 +535,7 @@
Name="VCLinkerTool"
LinkLibraryDependencies="false"
AdditionalDependencies="libiax2.lib libportmixer.lib libportaudio.lib libgsm.lib libspeex.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib"
- AdditionalLibraryDirectories=""$(SolutionDir)Release\libiax2";"$(SolutionDir)Release\libportaudio";"$(SolutionDir)Release\libportmixer";"$(SolutionDir)Release\libspeex";"$(SolutionDir)Release\libgsm""
+ AdditionalLibraryDirectories=""$(SolutionDir)Debug\libiax2";"$(SolutionDir)Debug\libportaudio";"$(SolutionDir)Debug\libportmixer";"$(SolutionDir)Debug\libspeex";"$(SolutionDir)Debug\libgsm""
/>
<Tool
Name="VCALinkTool"
Modified: trunk/contrib/win/vs2005/testcall.vcproj
===================================================================
--- trunk/contrib/win/vs2005/testcall.vcproj 2008-04-04 21:37:07 UTC (rev 1395)
+++ trunk/contrib/win/vs2005/testcall.vcproj 2008-04-07 15:27:20 UTC (rev 1396)
@@ -416,6 +416,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
/>
</Configuration>
<Configuration
@@ -496,6 +497,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
/>
</Configuration>
<Configuration
@@ -577,6 +579,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
/>
</Configuration>
<Configuration
@@ -657,6 +660,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
/>
</Configuration>
</Configurations>
Modified: trunk/contrib/win/vs2005/vtestcall.vcproj
===================================================================
--- trunk/contrib/win/vs2005/vtestcall.vcproj 2008-04-04 21:37:07 UTC (rev 1395)
+++ trunk/contrib/win/vs2005/vtestcall.vcproj 2008-04-07 15:27:20 UTC (rev 1396)
@@ -174,6 +174,167 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Debug_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\lib;..\..\..\..\SDL\include"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
+ MinimalRebuild="false"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ WarningLevel="3"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="false"
+ AdditionalDependencies="libiaxclient.lib SDL.lib wsock32.lib winmm.lib strmiids.lib"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories=""$(DXSDK_DIR)\lib\x86";..\..\..\..\SDL\lib;$(SolutionDir)$(ConfigurationName)\libiaxclient"
+ IgnoreDefaultLibraryNames="libcmtd.lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\lib;..\..\..\..\SDL\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
+ RuntimeLibrary="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="false"
+ AdditionalDependencies="libiaxclient.lib SDL.lib wsock32.lib winmm.lib strmiids.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\..\..\SDL\lib;$(SolutionDir)$(ConfigurationName)\libiaxclient"
+ IgnoreDefaultLibraryNames=""
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(SolutionDir)$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-07 15:32:10
|
Revision: 1397
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1397&view=rev
Author: jpgrayson
Date: 2008-04-07 08:31:56 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Commit patch from stevebvt adding a Visual Studio project and solution for iaxcomm.
Thanks Steve.
Modified Paths:
--------------
trunk/simpleclient/iaxcomm/prefs.cc
Added Paths:
-----------
trunk/simpleclient/iaxcomm/iaxcomm.sln
trunk/simpleclient/iaxcomm/iaxcomm.vcproj
Added: trunk/simpleclient/iaxcomm/iaxcomm.sln
===================================================================
--- trunk/simpleclient/iaxcomm/iaxcomm.sln (rev 0)
+++ trunk/simpleclient/iaxcomm/iaxcomm.sln 2008-04-07 15:31:56 UTC (rev 1397)
@@ -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
Added: trunk/simpleclient/iaxcomm/iaxcomm.vcproj
===================================================================
--- trunk/simpleclient/iaxcomm/iaxcomm.vcproj (rev 0)
+++ trunk/simpleclient/iaxcomm/iaxcomm.vcproj 2008-04-07 15:31:56 UTC (rev 1397)
@@ -0,0 +1,754 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="iaxcomm"
+ ProjectGUID="{3856417E-2A25-4094-A7E2-38AE64719ECA}"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ AssemblerOutput="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy ..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ AssemblerOutput="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy ..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_novideo|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ AssemblerOutput="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release_novideo_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ AssemblerOutput="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy ..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_novideo|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_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"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\lib;"C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ PreprocessorDefinitions="XRCDIRECTORY=\"..\\rc\";IAXCOMM_VERSION=\"1.0.0final\";WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ AdditionalIncludeDirectories=""C:\wxWidgets-2.8.6\include";"C:\wxWidgets-2.8.6\include\msvc""
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libiaxclient.lib comctl32.lib rpcrt4.lib ws2_32.lib"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""C:\wxWidgets-2.8.6\lib\vc_lib";..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy ..\..\contrib\win\vs2005\$(ConfigurationName)\libiaxclient\libiaxclient.dll $(OutDir)"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\accounts.h"
+ >
+ </File>
+ <File
+ RelativePath=".\app.h"
+ >
+ </File>
+ <File
+ RelativePath=".\calls.h"
+ >
+ </File>
+ <File
+ RelativePath=".\devices.h"
+ >
+ </File>
+ <File
+ RelativePath=".\dial.h"
+ >
+ </File>
+ <File
+ RelativePath=".\directory.h"
+ >
+ </File>
+ <File
+ RelativePath=".\frame.h"
+ >
+ </File>
+ <File
+ RelativePath=".\main.h"
+ >
+ </File>
+ <File
+ RelativePath=".\prefs.h"
+ >
+ </File>
+ <File
+ RelativePath=".\ringer.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ <File
+ RelativePath=".\iaxcomm.rc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\accounts.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\calls.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\devices.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\dial.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\directory.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\frame.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\main.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\prefs.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\ringer.cc"
+ >
+ </File>
+ </Filter>
+ <File
+ RelativePath=".\iaxcomm.exe.manifest"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: trunk/simpleclient/iaxcomm/prefs.cc
===================================================================
--- trunk/simpleclient/iaxcomm/prefs.cc 2008-04-07 15:27:20 UTC (rev 1396)
+++ trunk/simpleclient/iaxcomm/prefs.cc 2008-04-07 15:31:56 UTC (rev 1397)
@@ -106,11 +106,11 @@
EVT_CHECKBOX( XRCID("SPXVBR"), PrefsDialog::OnSpeexTune)
EVT_SPINCTRL( XRCID("SPXComplexity"), PrefsDialog::OnSpeexTuneSpinEvent)
- EVT_BUTTON ( XRCID("CancelAudio"), PrefsDialog::OnCancel)
- EVT_BUTTON ( XRCID("CancelCallerID"), PrefsDialog::OnCancel)
- EVT_BUTTON ( XRCID("CancelMisc"), PrefsDialog::OnCancel)
- EVT_BUTTON ( XRCID("CancelFilters"), PrefsDialog::OnCancel)
- EVT_BUTTON ( XRCID("CancelCodecs"), PrefsDialog::OnCancel)
+// EVT_BUTTON ( XRCID("CancelAudio"), PrefsDialog::OnCancel)
+// EVT_BUTTON ( XRCID("CancelCallerID"), PrefsDialog::OnCancel)
+// EVT_BUTTON ( XRCID("CancelMisc"), PrefsDialog::OnCancel)
+// EVT_BUTTON ( XRCID("CancelFilters"), PrefsDialog::OnCancel)
+// EVT_BUTTON ( XRCID("CancelCodecs"), PrefsDialog::OnCancel)
END_EVENT_TABLE()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-04 21:37:03
|
Revision: 1395
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1395&view=rev
Author: jpgrayson
Date: 2008-04-04 14:37:07 -0700 (Fri, 04 Apr 2008)
Log Message:
-----------
Fix to always define iaxc_version(). When LIBVER is not defined, just return an empty string.
Modified Paths:
--------------
trunk/lib/iaxclient_lib.c
Modified: trunk/lib/iaxclient_lib.c
===================================================================
--- trunk/lib/iaxclient_lib.c 2008-04-04 21:36:17 UTC (rev 1394)
+++ trunk/lib/iaxclient_lib.c 2008-04-04 21:37:07 UTC (rev 1395)
@@ -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)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-04 21:36:14
|
Revision: 1394
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1394&view=rev
Author: jpgrayson
Date: 2008-04-04 14:36:17 -0700 (Fri, 04 Apr 2008)
Log Message:
-----------
Add Release_novideo_dll and Debug_novideo_dll configurations to iaxclient VS2005 solution.
Fix dependency issues and automatic dependent library linking issues.
Thanks to stevebvt!
Modified Paths:
--------------
trunk/contrib/win/vs2005/iaxclient.sln
trunk/contrib/win/vs2005/libiaxclient.vcproj
trunk/contrib/win/vs2005/testcall.vcproj
Modified: trunk/contrib/win/vs2005/iaxclient.sln
===================================================================
--- trunk/contrib/win/vs2005/iaxclient.sln 2008-04-04 18:52:23 UTC (rev 1393)
+++ trunk/contrib/win/vs2005/iaxclient.sln 2008-04-04 21:36:17 UTC (rev 1394)
@@ -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,177 @@
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_novideo_dll|Win32.ActiveCfg = Debug|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo_dll|Win32.Build.0 = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.ActiveCfg = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug_novideo|Win32.Build.0 = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug|Win32.ActiveCfg = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Debug|Win32.Build.0 = Debug|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.ActiveCfg = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_dll|Win32.Build.0 = Release|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo_dll|Win32.ActiveCfg = Release|Win32
+ {B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo_dll|Win32.Build.0 = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.ActiveCfg = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release_novideo|Win32.Build.0 = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.ActiveCfg = Release|Win32
{B5F8E725-85A8-4CB1-8824-B82127BB2B1E}.Release|Win32.Build.0 = Release|Win32
{F5166D99-32BB-40D5-BE95-6F97F72C44CE}.Debug_dll|Win32.ActiveCfg = Debug|Win32
{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: trunk/contrib/win/vs2005/libiaxclient.vcproj
===================================================================
--- trunk/contrib/win/vs2005/libiaxclient.vcproj 2008-04-04 18:52:23 UTC (rev 1393)
+++ trunk/contrib/win/vs2005/libiaxclient.vcproj 2008-04-04 21:36:17 UTC (rev 1394)
@@ -16,7 +16,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
CharacterSet="2"
@@ -80,7 +80,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
CharacterSet="2"
@@ -143,7 +143,7 @@
</Configuration>
<Configuration
Name="Release_dll|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="2"
CharacterSet="2"
@@ -185,6 +185,7 @@
/>
<Tool
Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
AdditionalDependencies="libiax2.lib libvidcap.lib libportmixer.lib libportaudio.lib libgsm.lib libogg.lib libspeex.lib libtheora.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib"
AdditionalLibraryDirectories=""$(SolutionDir)Release\libiax2";"$(SolutionDir)Release\libvidcap";"$(SolutionDir)Release\libportaudio";"$(SolutionDir)Release\libportmixer";"$(SolutionDir)Release\libogg";"$(SolutionDir)Release\libtheora";"$(SolutionDir)Release\libspeex";"$(SolutionDir)Release\libgsm""
/>
@@ -215,8 +216,8 @@
</Configuration>
<Configuration
Name="Debug_dll|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
ConfigurationType="2"
CharacterSet="2"
>
@@ -258,6 +259,7 @@
/>
<Tool
Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
AdditionalDependencies="libiax2.lib libvidcap.lib libportmixer.lib libportaudio.lib libgsm.lib libogg.lib libspeex.lib libtheora.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib"
AdditionalLibraryDirectories=""$(SolutionDir)Debug\libiax2";"$(SolutionDir)Debug\libvidcap";"$(SolutionDir)Debug\libportaudio";"$(SolutionDir)Debug\libportmixer";"$(SolutionDir)Debug\libogg";"$(SolutionDir)Debug\libtheora";"$(SolutionDir)Debug\libspeex";"$(SolutionDir)Debug\libgsm""
/>
@@ -288,7 +290,7 @@
</Configuration>
<Configuration
Name="Release_novideo|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
CharacterSet="2"
@@ -351,7 +353,7 @@
</Configuration>
<Configuration
Name="Debug_novideo|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
IntermediateDirectory="$(OutDir)"
ConfigurationType="4"
CharacterSet="2"
@@ -413,6 +415,153 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Release_novideo_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\lib\portmixer\px_common"
+ PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;CODEC_GSM"
+ RuntimeLibrary="2"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="libiax2.lib libportmixer.lib libportaudio.lib libgsm.lib libspeex.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib"
+ AdditionalLibraryDirectories=""$(SolutionDir)Release\libiax2";"$(SolutionDir)Release\libportaudio";"$(SolutionDir)Release\libportmixer";"$(SolutionDir)Release\libspeex";"$(SolutionDir)Release\libgsm""
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug_novideo_dll|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
+ IntermediateDirectory="$(OutDir)"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\..\lib\libiax2\src;..\..\..\..\portaudio\include;..\..\..\lib\spandsp;..\..\..\lib\gsm\inc;..\..\..\..\speex\include;..\..\..\lib\portmixer\px_common"
+ PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_DLL;_CRT_SECURE_NO_DEPRECATE;strncasecmp=strnicmp;__inline__=_inline;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;CODEC_GSM"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkLibraryDependencies="false"
+ AdditionalDependencies="libiax2.lib libportmixer.lib libportaudio.lib libgsm.lib libspeex.lib comsuppw.lib strmiids.lib wininet.lib ws2_32.lib"
+ AdditionalLibraryDirectories=""$(SolutionDir)Release\libiax2";"$(SolutionDir)Release\libportaudio";"$(SolutionDir)Release\libportmixer";"$(SolutionDir)Release\libspeex";"$(SolutionDir)Release\libgsm""
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</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: trunk/contrib/win/vs2005/testcall.vcproj
===================================================================
--- trunk/contrib/win/vs2005/testcall.vcproj 2008-04-04 18:52:23 UTC (rev 1393)
+++ trunk/contrib/win/vs2005/testcall.vcproj 2008-04-04 21:36:17 UTC (rev 1394)
@@ -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,328 @@
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"
+ />
+ </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"
+ />
+ </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"
+ />
+ </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"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jpg...@us...> - 2008-04-04 18:52:20
|
Revision: 1393
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1393&view=rev
Author: jpgrayson
Date: 2008-04-04 11:52:23 -0700 (Fri, 04 Apr 2008)
Log Message:
-----------
Add doc directory to the distribution list.
Remove bogus reference to vtestcall.vcproj.
Modified Paths:
--------------
trunk/Makefile.am
trunk/simpleclient/vtestcall/Makefile.am
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-04-04 18:51:03 UTC (rev 1392)
+++ trunk/Makefile.am 2008-04-04 18:52:23 UTC (rev 1393)
@@ -12,6 +12,8 @@
README.VisualStudio \
autogen.sh \
contrib \
+ doc \
+ Doxyfile \
m4
dist-hook:
Modified: trunk/simpleclient/vtestcall/Makefile.am
===================================================================
--- trunk/simpleclient/vtestcall/Makefile.am 2008-04-04 18:51:03 UTC (rev 1392)
+++ trunk/simpleclient/vtestcall/Makefile.am 2008-04-04 18:52:23 UTC (rev 1393)
@@ -4,4 +4,4 @@
AM_CPPFLAGS=-I$(top_srcdir)/lib $(SDL_CFLAGS) $(OGGZ_CFLAGS)
vtestcall_LDADD=$(top_builddir)/lib/libiaxclient.la $(SDL_LIBS) $(OGGZ_LIBS)
-EXTRA_DIST = vtestcall.vcproj
+EXTRA_DIST =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
11 messages has been excluded from this view by a project administrator.
