move libs/stfu into the core, as it is not really a lib

diff --git a/Makefile.am b/Makefile.am
index f795cf8aabe0fa889c232b01e09643fe5c32071b..698553787e7ba3a114f7f868a23d103ad2d77b54 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,7 +112,6 @@ $(RECURSIVE_TARGETS): freeswitch
 CORE_CFLAGS  = $(AM_LIBAPR_CFLAGS) $(AM_LIBAPR_CPPFLAGS)
 CORE_CFLAGS += $(AM_LIBAPU_CPPFLAGS)
 CORE_CFLAGS += -I$(switch_srcdir)/libs/libtpl-1.5/src
-CORE_CFLAGS += -I$(switch_srcdir)/libs/stfu
 CORE_CFLAGS += -I$(switch_builddir)/libs/sqlite
 CORE_CFLAGS += -I$(switch_srcdir)/libs/pcre
 CORE_CFLAGS += -I$(switch_srcdir)/libs/speex/include -Ilibs/speex/include
@@ -218,7 +217,7 @@ library_include_HEADERS = \
        src/include/switch_cpp.h \
        src/include/switch_curl.h \
        src/include/switch_json.h \
-       libs/stfu/stfu.h \
+       src/include/switch_stfu.h \
        libs/libteletone/src/libteletone_detect.h \
        libs/libteletone/src/libteletone_generate.h \
        libs/libteletone/src/libteletone.h \
@@ -294,8 +293,8 @@ libfreeswitch_la_SOURCES = \
        src/switch_json.c \
        src/switch_curl.c \
        src/switch_hashtable.c\
+       src/switch_stfu.c \
        libs/libtpl-1.5/src/tpl.c \
-       libs/stfu/stfu.c \
        libs/libteletone/src/libteletone_detect.c \
        libs/libteletone/src/libteletone_generate.c \
        libs/miniupnpc/miniwget.c \

diff --git a/configure.ac b/configure.ac
index 225886bc0bee837b25a788dfd743a93648b11151..80841b1185a904500ac9c66cf08002241918fb04 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -203,8 +203,8 @@ if test "${enable_optimizer}" = "yes" ; then
 fi
 
 # set defaults for use on all platforms
-SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src -I${switch_srcdir}/libs/stfu"
-SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src -I${switch_srcdir}/libs/stfu"
+SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src"
+SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src"
 SWITCH_AM_LDFLAGS="-lm"
 
 #set SOLINK variable based on compiler and host

diff --git a/debian/copyright b/debian/copyright
index 3fe3844e280d0877d8ccef35991cf32ce4a806e6..46826f55610f9da6fe4e831f98840c27a1a7ea9c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2051,10 +2051,6 @@ Files: libs/libzrtp/third_party/bnlib/test/md5.c
 Copyright: 1995 Abandoned Colin Plumb
 License: public-domain
 
-Files: libs/stfu/*
-Copyright: 2007-2014 Anthony Minessale II <anthm@freeswitch.org>
-License: MIT/X11 (BSD like)
-
 Files: libs/sqlite/*
 Copyright: 2006 Abandoned D. Richard Hipp <drh@hwaci.com>
  1993 Abandoned Colin Plumb

diff --git a/docs/Doxygen.conf b/docs/Doxygen.conf
index dc7c4f8c52b268addb66259c61b3bc2948b59a11..c7fc40ee7361eea755d9b0c8d8f6389603318c0f 100644 (file)
--- a/docs/Doxygen.conf
+++ b/docs/Doxygen.conf
@@ -1246,7 +1246,7 @@ INCLUDE_PATH           =../libs/apr ../libs/apr-util ../libs/curl \
                        ../libs/libsndfile ../libs/miniupnpc ../libs/pcre \
                        ../libs/portaudio ../libs/sofia-sip ../libs/spandsp \
                        ../libs/speex ../libs/sqlite ../libs/srtp \
-                       ../libs/stfu ../libs/tiff-4.0.2 ../libs/udns \
+                       ../libs/tiff-4.0.2 ../libs/udns \
                        ../libs/unimrcp ../libs/voipcodecs ../libs/win32 \
                        ../libs/xmlrpc-c ../libs/yaml 
 

diff --git a/freeswitch.xcodeproj/project.pbxproj b/freeswitch.xcodeproj/project.pbxproj
index 626260934756829019548f9bcd0a629793bf8147..3fd96a8c16295931cbdd0cdc758c891e22c8bdf8 100644 (file)
--- a/freeswitch.xcodeproj/project.pbxproj
+++ b/freeswitch.xcodeproj/project.pbxproj
@@ -71,7 +71,7 @@
                4BDD804BDD804BDD80000000 /* switch_xml.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BD8404BD8404BD840000000 /* switch_xml.c */; settings = {COMPILER_FLAGS = ""; }; };
                4BE7E04BE7E04BE7E0000000 /* switch_config.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BE3004BE3004BE300000000 /* switch_config.c */; settings = {COMPILER_FLAGS = ""; }; };
                4BF3004BF3004BF300000000 /* switch_time.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BEDC04BEDC04BEDC0000000 /* switch_time.c */; settings = {COMPILER_FLAGS = ""; }; };
-               4BFDC04BFDC04BFDC0000000 /* stfu.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8804BF8804BF880000000 /* stfu.c */; settings = {COMPILER_FLAGS = ""; }; };
+               4BFDC04BFDC04BFDC0000000 /* switch_stfu.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8804BF8804BF880000000 /* switch_stfu.c */; settings = {COMPILER_FLAGS = ""; }; };
                4C08204C08204C0820000000 /* switch_cpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C03404C03404C0340000000 /* switch_cpp.cpp */; settings = {COMPILER_FLAGS = ""; }; };
                4C12A04C12A04C12A0000000 /* g711.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C0E004C0E004C0E00000000 /* g711.c */; settings = {COMPILER_FLAGS = ""; }; };
                4C1DA04C1DA04C1DA0000000 /* switch_pcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C1CB04C1CB04C1CB0000000 /* switch_pcm.c */; settings = {COMPILER_FLAGS = ""; }; };
@@ -99,7 +99,7 @@
                607C60607C60607C60000000 /* pcre_info.c in Sources */ = {isa = PBXBuildFile; fileRef = 6077B06077B06077B0000000 /* pcre_info.c */; settings = {COMPILER_FLAGS = ""; }; };
                609CD0609CD0609CD0000000 /* pcre_maketables.c in Sources */ = {isa = PBXBuildFile; fileRef = 609810609810609810000000 /* pcre_maketables.c */; settings = {COMPILER_FLAGS = ""; }; };
                60B26060B26060B260000000 /* pcre_ord2utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = 60ADA060ADA060ADA0000000 /* pcre_ord2utf8.c */; settings = {COMPILER_FLAGS = ""; }; };
-               60B8B060B8B060B8B0000000 /* stfu.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8804BF8804BF880000000 /* stfu.c */; settings = {COMPILER_FLAGS = ""; }; };
+               60B8B060B8B060B8B0000000 /* switch_stfu.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BF8804BF8804BF880000000 /* switch_stfu.c */; settings = {COMPILER_FLAGS = ""; }; };
                60BDE060BDE060BDE0000000 /* pcredemo.c in Sources */ = {isa = PBXBuildFile; fileRef = 60BD2060BD2060BD20000000 /* pcredemo.c */; settings = {COMPILER_FLAGS = ""; }; };
                60C8C060C8C060C8C0000000 /* pcre_refcount.c in Sources */ = {isa = PBXBuildFile; fileRef = 60C3A060C3A060C3A0000000 /* pcre_refcount.c */; settings = {COMPILER_FLAGS = ""; }; };
                60D30060D30060D300000000 /* pcregrep.c in Sources */ = {isa = PBXBuildFile; fileRef = 60CE5060CE5060CE50000000 /* pcregrep.c */; settings = {COMPILER_FLAGS = ""; }; };
@@ -200,7 +200,7 @@
                4BD8404BD8404BD840000000 /* switch_xml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = switch_xml.c; path = "/Users/shaneburrell/freeswitch-svn-real/src/switch_xml.c"; sourceTree = "<absolute>"; };
                4BE3004BE3004BE300000000 /* switch_config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = switch_config.c; path = "/Users/shaneburrell/freeswitch-svn-real/src/switch_config.c"; sourceTree = "<absolute>"; };
                4BEDC04BEDC04BEDC0000000 /* switch_time.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = switch_time.c; path = "/Users/shaneburrell/freeswitch-svn-real/src/switch_time.c"; sourceTree = "<absolute>"; };
-               4BF8804BF8804BF880000000 /* stfu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stfu.c; path = "/Users/shaneburrell/freeswitch-svn-real/libs/stfu/stfu.c"; sourceTree = "<absolute>"; };
+               4BF8804BF8804BF880000000 /* switc_stfu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = switch_stfu.c; path = "/Users/shaneburrell/freeswitch-svn-real/src/switch_stfu.c"; sourceTree = "<absolute>"; };
                4C03404C03404C0340000000 /* switch_cpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = switch_cpp.cpp; path = "/Users/shaneburrell/freeswitch-svn-real/src/switch_cpp.cpp"; sourceTree = "<absolute>"; };
                4C0E004C0E004C0E00000000 /* g711.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g711.c; path = "/Users/shaneburrell/freeswitch-svn-real/src/g711.c"; sourceTree = "<absolute>"; };
                4C1CB04C1CB04C1CB0000000 /* switch_pcm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = switch_pcm.c; path = "/Users/shaneburrell/freeswitch-svn-real/src/switch_pcm.c"; sourceTree = "<absolute>"; };
@@ -279,7 +279,7 @@
                613A60613A60613A60000000 /* ucpinternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ucpinternal.h; path = "/Users/shaneburrell/freeswitch-svn-real/libs/pcre/ucpinternal.h"; sourceTree = "<absolute>"; };
                613ED0613ED0613ED0000000 /* pcre_chartables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pcre_chartables.c; path = "/Users/shaneburrell/freeswitch-svn-real/libs/pcre/pcre_chartables.c"; sourceTree = "<absolute>"; };
                61E47061E47061E470000000 /* libpcre.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libpcre.a; sourceTree = BUILT_PRODUCTS_DIR; };
-               61F2B061F2B061F2B0000000 /* stfu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stfu.h; path = "/Users/shaneburrell/freeswitch-svn-real/libs/stfu/stfu.h"; sourceTree = "<absolute>"; };
+               61F2B061F2B061F2B0000000 /* switch_stfu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = switch_stfu.h; path = "/Users/shaneburrell/freeswitch-svn-real/src/include/switch_stfu.h"; sourceTree = "<absolute>"; };
                628790628790628790000000 /* libstfu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libstfu.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -414,7 +414,7 @@
                                4BD8404BD8404BD840000000 /* switch_xml.c */,
                                4BE3004BE3004BE300000000 /* switch_config.c */,
                                4BEDC04BEDC04BEDC0000000 /* switch_time.c */,
-                               4BF8804BF8804BF880000000 /* stfu.c */,
+                               4BF8804BF8804BF880000000 /* switch_stfu.c */,
                                4C03404C03404C0340000000 /* switch_cpp.cpp */,
                                4C0E004C0E004C0E00000000 /* g711.c */,
                                4C1CB04C1CB04C1CB0000000 /* switch_pcm.c */,
@@ -578,7 +578,7 @@
                48FA9048FA9048FA90000000 /* Source Files */ = {
                        isa = PBXGroup;
                        children = (
-                               4BF8804BF8804BF880000000 /* stfu.c */,
+                               4BF8804BF8804BF880000000 /* switch_stfu.c */,
                        );
                        name = "Source Files";
                        sourceTree = "<group>";
@@ -586,7 +586,7 @@
                48FEE048FEE048FEE0000000 /* Header Files */ = {
                        isa = PBXGroup;
                        children = (
-                               61F2B061F2B061F2B0000000 /* stfu.h */,
+                               61F2B061F2B061F2B0000000 /* switch_stfu.h */,
                        );
                        name = "Header Files";
                        sourceTree = "<group>";
@@ -922,7 +922,7 @@
                                4BDD804BDD804BDD80000000 /* switch_xml.c in Sources */,
                                4BE7E04BE7E04BE7E0000000 /* switch_config.c in Sources */,
                                4BF3004BF3004BF300000000 /* switch_time.c in Sources */,
-                               4BFDC04BFDC04BFDC0000000 /* stfu.c in Sources */,
+                               4BFDC04BFDC04BFDC0000000 /* switch_stfu.c in Sources */,
                                4C08204C08204C0820000000 /* switch_cpp.cpp in Sources */,
                                4C12A04C12A04C12A0000000 /* g711.c in Sources */,
                                4C1DA04C1DA04C1DA0000000 /* switch_pcm.c in Sources */,
@@ -985,7 +985,7 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               60B8B060B8B060B8B0000000 /* stfu.c in Sources */,
+                               60B8B060B8B060B8B0000000 /* switch_stfu.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -1071,7 +1071,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                );
@@ -1113,7 +1112,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                );
@@ -1155,7 +1153,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                );
@@ -1197,7 +1194,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                );
@@ -1241,7 +1237,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                );
@@ -1313,7 +1308,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                );
@@ -1385,7 +1379,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                );
@@ -1457,7 +1450,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                );
@@ -1531,7 +1523,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/../libs/libresample/include",
@@ -1583,7 +1574,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/../libs/libresample/include",
@@ -1635,7 +1625,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/../libs/libresample/include",
@@ -1687,7 +1676,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/../libs/libresample/include",
@@ -1737,7 +1725,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libresample/include",
@@ -1784,7 +1771,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libresample/include",
@@ -1831,7 +1817,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libresample/include",
@@ -1878,7 +1863,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libresample/include",
@@ -1925,7 +1909,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/include",
@@ -1972,7 +1955,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/include",
@@ -2019,7 +2001,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/include",
@@ -2066,7 +2047,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/include",
@@ -2113,7 +2093,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/pcre/include",
@@ -2161,7 +2140,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/pcre/include",
@@ -2209,7 +2187,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/pcre/include",
@@ -2257,7 +2234,6 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/pcre/include",
@@ -2305,10 +2281,8 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu/include",
                                );
                                INSTALL_PATH = "";
                                LIBRARY_STYLE = STATIC;
@@ -2352,10 +2326,8 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu/include",
                                );
                                INSTALL_PATH = "";
                                LIBRARY_STYLE = STATIC;
@@ -2399,10 +2371,8 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu/include",
                                );
                                INSTALL_PATH = "";
                                LIBRARY_STYLE = STATIC;
@@ -2446,10 +2416,8 @@
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/voipcodecs/src",
                                        "/Users/shaneburrell/freeswitch-svn-real/src/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/libteletone/src",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr/include",
                                        "/Users/shaneburrell/freeswitch-svn-real/libs/apr-util/include",
-                                       "/Users/shaneburrell/freeswitch-svn-real/libs/stfu/include",
                                );
                                INSTALL_PATH = "";
                                LIBRARY_STYLE = STATIC;

diff --git a/libs/stfu/CMakeLists.txt b/libs/stfu/CMakeLists.txt
deleted file mode 100644 (file)
index 2d8250a..0000000
--- a/libs/stfu/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-INCLUDE_DIRECTORIES(include/) 
-
-SET ( stfu_SRCS stfu.c stfu.h)
-ADD_LIBRARY(stfu STATIC ${stfu_SRCS})
-
-
-
-
-
-
-

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9dd70ee0aca25303e5ea5b0a96f17aac2ed7b28a..c071a518bd6d1fe6055b82019fdc7c2004a761a1 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,7 +52,7 @@ switch_log.c
 switch_xml.c
 switch_config.c
 switch_time.c
-../libs/stfu/stfu.c
+switch_stfu.c
 switch_cpp.cpp
 g711.c
 switch_pcm.c

diff --git a/src/include/switch.h b/src/include/switch.h
index 72b93cea25c664492eeeb46916533ca35f21a80c..2386ae8a7ff46e6a8b752e6d7fbc98a6e874a6d4 100644 (file)
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -106,11 +106,7 @@
 #include <signal.h>
 #include <errno.h>
 
-#ifndef WIN32
-#include "stfu.h"
-#else
-#include "../../../libs/stfu/stfu.h"
-#endif
+#include "switch_stfu.h"
 #include "switch_platform.h"
 #include "switch_types.h"
 #include "switch_apr.h"

diff --git a/libs/stfu/stfu.h b/src/include/switch_stfu.h
similarity index 100%
rename from libs/stfu/stfu.h
rename to src/include/switch_stfu.h

diff --git a/src/mod/applications/mod_mongo/Makefile.am b/src/mod/applications/mod_mongo/Makefile.am
index 44f44d4b6718b6aebdee862248e9d630ab61b715..5dd2ad14ed72f5fb8c5f367419cf622b4eaab403 100644 (file)
--- a/src/mod/applications/mod_mongo/Makefile.am
+++ b/src/mod/applications/mod_mongo/Makefile.am
@@ -10,7 +10,7 @@ LIBMONGOCLIENT_A =$(MONGO_CXX_DRIVER_SRC)/libmongoclient.a
 mod_LTLIBRARIES = mod_mongo.la
 mod_mongo_la_SOURCES  = mod_mongo.cpp
 mod_mongo_la_CFLAGS   = $(AM_CFLAGS)
-mod_mongo_la_CPPFLAGS = -I$(MONGO_CXX_DRIVER_SRC)/src  -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/                                   
+mod_mongo_la_CPPFLAGS = -I$(MONGO_CXX_DRIVER_SRC)/src -I$(switch_srcdir)/libs/libteletone/src/
 mod_mongo_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LIBMONGOCLIENT_A)
 mod_mongo_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lboost_thread -lboost_filesystem-mt -lboost_system-mt
 

diff --git a/src/mod/codecs/mod_silk/Makefile.am b/src/mod/codecs/mod_silk/Makefile.am
index 619e68161a802832239c828b1d9e18e70897703e..65aba04be083a7051d4ec65e0ca23d054d96e25b 100644 (file)
--- a/src/mod/codecs/mod_silk/Makefile.am
+++ b/src/mod/codecs/mod_silk/Makefile.am
@@ -6,7 +6,7 @@ SILK_BUILDDIR=$(switch_builddir)/libs/silk
 SILK_LA=$(SILK_BUILDDIR)/.libs/libSKP_SILK_SDK.la
 
 mod_LTLIBRARIES = mod_silk.la
-mod_silk_la_SOURCES  = mod_silk.c ../../../../libs/stfu/stfu.c
+mod_silk_la_SOURCES  = mod_silk.c
 mod_silk_la_CFLAGS   = $(AM_CFLAGS) -I$(SILK_DIR)/src  -I$(SILK_DIR)/interface
 mod_silk_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SILK_LA)
 mod_silk_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

diff --git a/src/mod/codecs/mod_silk/mod_silk.c b/src/mod/codecs/mod_silk/mod_silk.c
index 78178017413b0474b1925dda23a8d3c4f0ca731e..2708a0f6dad9ef08a1466be199f9e98b2ebefdd0 100644 (file)
--- a/src/mod/codecs/mod_silk/mod_silk.c
+++ b/src/mod/codecs/mod_silk/mod_silk.c
@@ -31,11 +31,6 @@
  */
 
 #include "switch.h"
-#ifndef WIN32
-#include "stfu.h"
-#else
-#include "../../../libs/stfu/stfu.h"
-#endif
 #include "SKP_Silk_SDK_API.h"
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_silk_load);

diff --git a/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am b/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am
index 68f5d3814bb2875452517ac339e4d22aa8e2e9c0..5552659206373c5e579762c55c4e5350d0976eb6 100644 (file)
--- a/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am
+++ b/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am
@@ -4,6 +4,6 @@ MONGODB_DRIVER=./driver/src
 mod_LTLIBRARIES = mod_cdr_mongodb.la
 mod_cdr_mongodb_la_SOURCES  = mod_cdr_mongodb.c ./driver/src/encoding.c ./driver/src/env_posix.c ./driver/src/bson.c ./driver/src/md5.c ./driver/src/mongo.c ./driver/src/numbers.c
 mod_cdr_mongodb_la_CFLAGS   = $(AM_CFLAGS)
-mod_cdr_mongodb_la_CPPFLAGS = -I$(MONGODB_DRIVER) -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ -D_GNU_SOURCE                          
+mod_cdr_mongodb_la_CPPFLAGS = -I$(MONGODB_DRIVER) -I$(switch_srcdir)/libs/libteletone/src/ -D_GNU_SOURCE                          
 mod_cdr_mongodb_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_cdr_mongodb_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

diff --git a/src/mod/event_handlers/mod_event_zmq/Makefile.am b/src/mod/event_handlers/mod_event_zmq/Makefile.am
index 4cd857685d80292a57a6c2d253cf54d8ebd4e71e..579fbfa144342d1a92030a02aa8a572d799618dc 100644 (file)
--- a/src/mod/event_handlers/mod_event_zmq/Makefile.am
+++ b/src/mod/event_handlers/mod_event_zmq/Makefile.am
@@ -12,7 +12,7 @@ ZMQ_LA=$(ZMQ_BUILDDIR)/src/libzmq.la
 mod_LTLIBRARIES = mod_event_zmq.la
 mod_event_zmq_la_SOURCES  = mod_event_zmq.cpp
 mod_event_zmq_la_CFLAGS   = $(AM_CFLAGS)
-mod_event_zmq_la_CPPFLAGS = -I$(ZMQ_DIR)/include -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/                                         
+mod_event_zmq_la_CPPFLAGS = -I$(ZMQ_DIR)/include -I$(switch_srcdir)/libs/libteletone/src/                                         
 mod_event_zmq_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(ZMQ_LA)
 mod_event_zmq_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 

diff --git a/src/mod/languages/mod_managed/Makefile.am b/src/mod/languages/mod_managed/Makefile.am
index 69ed2264c6e388f0ccfa867d3f3c78cee037729e..80f5d1b1a39c78e377e9335a8fd3c7e77928be4b 100644 (file)
--- a/src/mod/languages/mod_managed/Makefile.am
+++ b/src/mod/languages/mod_managed/Makefile.am
@@ -4,7 +4,7 @@ MODNAME=mod_managed
 mod_LTLIBRARIES = mod_managed.la
 mod_managed_la_SOURCES  = mod_managed.cpp freeswitch_managed.cpp freeswitch_wrap.cpp
 mod_managed_la_CFLAGS   = $(AM_CFLAGS)
-mod_managed_la_CPPFLAGS = `/usr/bin/pkg-config mono-2 --cflags` -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ 
+mod_managed_la_CPPFLAGS = `/usr/bin/pkg-config mono-2 --cflags` -I$(switch_srcdir)/libs/libteletone/src/ 
 mod_managed_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_managed_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `/usr/bin/pkg-config mono-2 --libs`
 

diff --git a/src/mod/languages/mod_perl/Makefile.am b/src/mod/languages/mod_perl/Makefile.am
index 7e34943bc8c2e13e0faf333b5c855e11b20a93d5..f42a02ebb72e0c517e86ec7164b8383d9ae9cff3 100644 (file)
--- a/src/mod/languages/mod_perl/Makefile.am
+++ b/src/mod/languages/mod_perl/Makefile.am
@@ -9,13 +9,13 @@ mod_LTLIBRARIES = mod_perl.la
 perl_LTLIBRARIES = freeswitch.la
 mod_perl_la_SOURCES  = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
 mod_perl_la_CFLAGS   = $(AM_CFLAGS) -w
-mod_perl_la_CPPFLAGS = -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ 
+mod_perl_la_CPPFLAGS = -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ 
 mod_perl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
 
 freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
 freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS)
-freeswitch_la_CPPFLAGS = -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ 
+freeswitch_la_CPPFLAGS = -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ 
 reswig:        swigclean mod_perl_wrap.cpp
 
 swigclean: clean

diff --git a/src/mod/languages/mod_python/Makefile.am b/src/mod/languages/mod_python/Makefile.am
index 06526e39082c594ace32e69f2fb44778798f51f8..a299841526e80e94ff5c1e0f15554254df114d58 100644 (file)
--- a/src/mod/languages/mod_python/Makefile.am
+++ b/src/mod/languages/mod_python/Makefile.am
@@ -10,7 +10,7 @@ SWIGIFILE=../../../switch_swig.i
 mod_LTLIBRARIES = mod_python.la
 mod_python_la_SOURCES  = mod_python.c freeswitch_python.cpp mod_python_wrap.cpp
 mod_python_la_CFLAGS   = $(AM_CFLAGS)
-mod_python_la_CPPFLAGS = @PYTHON_CFLAGS@ -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ 
+mod_python_la_CPPFLAGS = @PYTHON_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/ 
 mod_python_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_python_la_LDFLAGS  = -avoid-version -module -no-undefined -shared @PYTHON_LDFLAGS@
 

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 4c1ada013baf9fcfe15a4b5ce37c9b457ebb33f6..664b56fd4bc18beb39dea44c3dae9204bd6135ab 100644 (file)
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -37,7 +37,6 @@
 
 #include <switch.h>
 #include <switch_ivr.h>
-#include "stfu.h"
 
 SWITCH_DECLARE(switch_status_t) switch_ivr_sound_test(switch_core_session_t *session)
 {

diff --git a/libs/stfu/stfu.c b/src/switch_stfu.c
similarity index 99%
rename from libs/stfu/stfu.c
rename to src/switch_stfu.c
index 8bf8fa8bfe7cc92e1fa7b7c7cfda0c1b9cd70de3..b951206a9c4c465089eca7543f501ead07ab36db 100644 (file)
--- a/libs/stfu/stfu.c
+++ b/src/switch_stfu.c
@@ -25,7 +25,7 @@
  *
  * THOSE WHO DISAGREE MAY CERTAINLY STFU
  */
-#include "stfu.h"
+#include "switch_stfu.h"
 
 //#define DB_JB 1
 

diff --git a/w32/Library/FreeSwitchCore.2008.vcproj b/w32/Library/FreeSwitchCore.2008.vcproj
index deda4ee7d1872457c2a131d191dbcee83a43d020..7fa0eb9629a06eb3c1ff2c4f95425dbcb320c314 100644 (file)
--- a/w32/Library/FreeSwitchCore.2008.vcproj
+++ b/w32/Library/FreeSwitchCore.2008.vcproj
@@ -47,7 +47,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;TPL_NOLIB;STFU_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -141,7 +141,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;TPL_NOLIB;STFU_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -234,7 +234,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;TPL_NOLIB;STFU_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
@@ -324,7 +324,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;TPL_NOLIB;STFU_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
@@ -515,7 +515,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libs\stfu\stfu.c"\r
+                               RelativePath="..\..\src\switch_stfu.c"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
@@ -1517,7 +1517,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libs\stfu\stfu.h"\r
+                               RelativePath="..\..\src\include\switch_stfu.h"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj
index df415faf80d72c1e1203d0c53767f0a55c36be6a..0047b9df7e70a1a7fec3a96c15587852879ddc0a 100644 (file)
--- a/w32/Library/FreeSwitchCore.2010.vcxproj
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj
@@ -88,7 +88,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -147,7 +147,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -199,7 +199,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
@@ -249,7 +249,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
@@ -328,7 +328,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
       </PrecompiledHeader>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\libs\stfu\stfu.c">\r
+    <ClCompile Include="..\..\src\switch_stfu.c">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
       </PrecompiledHeader>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
@@ -723,7 +723,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     <ClInclude Include="..\..\libs\miniupnpc\declspec.h" />\r
     <ClInclude Include="..\..\src\include\g711.h" />\r
     <ClInclude Include="..\..\src\include\SimpleGlob.h" />\r
-    <ClInclude Include="..\..\libs\stfu\stfu.h" />\r
+    <ClInclude Include="..\..\src\include\switch_stfu.h" />\r
     <ClInclude Include="..\..\src\include\switch.h" />\r
     <ClInclude Include="..\..\src\include\switch_apr.h" />\r
     <ClInclude Include="..\..\src\include\switch_bitpack.h" />\r

diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj.filters b/w32/Library/FreeSwitchCore.2010.vcxproj.filters
index aa60693440e0bf69a6888a9405fc94ad2d99b130..86cab5f207c41ec60eacaef52268d8795019a039 100644 (file)
--- a/w32/Library/FreeSwitchCore.2010.vcxproj.filters
+++ b/w32/Library/FreeSwitchCore.2010.vcxproj.filters
@@ -34,7 +34,7 @@
     <ClCompile Include="..\..\libs\libnatpmp\natpmp.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\libs\stfu\stfu.c">\r
+    <ClCompile Include="..\..\src\switch_stfu.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\src\switch_apr.c">\r
@@ -255,7 +255,7 @@
     <ClInclude Include="..\..\src\include\switch_caller.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\libs\stfu\stfu.h">\r
+    <ClInclude Include="..\..\src\include\switch_stfu.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\src\include\switch_channel.h">\r

diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj b/w32/Library/FreeSwitchCore.2012.vcxproj
index 1f50fa2a25d7ef05ae1eab414a1efcbf12bea6a8..aefde84a748371834ee037d691cd9941566faaeb 100644 (file)
--- a/w32/Library/FreeSwitchCore.2012.vcxproj
+++ b/w32/Library/FreeSwitchCore.2012.vcxproj
@@ -92,7 +92,7 @@
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -155,7 +155,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
@@ -209,7 +209,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </PreBuildEvent>\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Create</PrecompiledHeader>\r
@@ -260,7 +260,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     </Midl>\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\tiff-4.0.2\libtiff;..\..\libs\libzrtp\include;..\..\libs\libzrtp\third_party\bgaes;..\..\libs\libzrtp\third_party\bnlib;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\openssl-1.0.1f\include;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC;ENABLE_ZRTP;TPL_NOLIB;STFU_EXPORTS;LIBSOFIA_SIP_UA_STATIC;HAVE_OPENSSL;HAVE_OPENSSL_DTLS_SRTP;HAVE_OPENSSL_DTLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Create</PrecompiledHeader>\r
@@ -341,7 +341,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
       </PrecompiledHeader>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\libs\stfu\stfu.c">\r
+    <ClCompile Include="..\..\src\switch_stfu.c">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
       </PrecompiledHeader>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
@@ -746,7 +746,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
     <ClInclude Include="..\..\libs\miniupnpc\declspec.h" />\r
     <ClInclude Include="..\..\src\include\g711.h" />\r
     <ClInclude Include="..\..\src\include\SimpleGlob.h" />\r
-    <ClInclude Include="..\..\libs\stfu\stfu.h" />\r
+    <ClInclude Include="..\..\src\include\switch_stfu.h" />\r
     <ClInclude Include="..\..\src\include\switch.h" />\r
     <ClInclude Include="..\..\src\include\switch_apr.h" />\r
     <ClInclude Include="..\..\src\include\switch_bitpack.h" />\r
@@ -893,4 +893,4 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj.filters b/w32/Library/FreeSwitchCore.2012.vcxproj.filters
index e4693dafead9489239cdba37b759a0991fa9df11..100c4d629b6fa1831083f0c67f82742b2e910d1b 100644 (file)
--- a/w32/Library/FreeSwitchCore.2012.vcxproj.filters
+++ b/w32/Library/FreeSwitchCore.2012.vcxproj.filters
@@ -34,7 +34,7 @@
     <ClCompile Include="..\..\libs\libnatpmp\natpmp.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\libs\stfu\stfu.c">\r
+    <ClCompile Include="..\..\src\switch_stfu.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\src\switch_apr.c">\r
@@ -255,7 +255,7 @@
     <ClInclude Include="..\..\src\include\switch_caller.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\libs\stfu\stfu.h">\r
+    <ClInclude Include="..\..\src\include\switch_stfu.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\src\include\switch_channel.h">\r
@@ -387,4 +387,4 @@
       <Filter>Version Files</Filter>\r
     </None>\r
   </ItemGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/w32/Library/FreeSwitchCore.vcproj b/w32/Library/FreeSwitchCore.vcproj
index 818da38f3c2dc7d23ce0e09ee1a900b7171e9c0f..8022c22beba0b7a3a31039beed7abed595fd86e6 100644 (file)
--- a/w32/Library/FreeSwitchCore.vcproj
+++ b/w32/Library/FreeSwitchCore.vcproj
@@ -43,7 +43,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -136,7 +136,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"\r
+                               AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\speex\include;libs\libtpl-1.5\src;libs\libtpl-1.5\src\win;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
@@ -247,7 +247,7 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libs\stfu\stfu.c"\r
+                               RelativePath="..\..\src\switch_stfu.c"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
@@ -945,7 +945,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libs\stfu\stfu.h"\r
+                               RelativePath="..\..\src\include\switch_stfu.h"\r
                                >\r
                        </File>\r
                        <File\r