mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-12 20:47:06 +00:00
merge jrtplib jthread and jrtp4c into 1 library (thanks mikej)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@495 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
647f5e4a30
commit
257a892998
145 files changed
+78726
-209
No files matched your search
@@ -1,5 +1,5 @@
|
||||
#CFLAGS += -I/usr/src/common/src
|
||||
LDFLAGS += -leXosip2 -ljrtp4c
|
||||
LDFLAGS += -leXosip2 -ljrtp
|
||||
|
||||
ifeq ($(OSARCH),Darwin)
|
||||
LINKER=g++
|
||||
@@ -10,9 +10,7 @@ endif
|
||||
all: depends $(MODNAME).so
|
||||
|
||||
depends:
|
||||
$(BASE)/buildlib.sh $(BASE) install jthread-1.1.2.tar.gz --prefix=$(PREFIX)
|
||||
$(BASE)/buildlib.sh $(BASE) install jrtplib-3.3.0.tar.gz --prefix=$(PREFIX) --with-jthread-includes=$(PREFIX)/include/jthread
|
||||
$(BASE)/buildlib.sh $(BASE) install jrtp4c --prefix=$(PREFIX)
|
||||
$(BASE)/buildlib.sh $(BASE) install jrtplib --prefix=$(PREFIX) --disable-gst
|
||||
$(BASE)/buildlib.sh $(BASE) install libosip2-2.2.2.tar.gz --prefix=$(PREFIX)
|
||||
$(BASE)/buildlib.sh $(BASE) install libeXosip2-2.2.2.tar.gz --disable-josua --prefix=$(PREFIX)
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
#define HAVE_APR
|
||||
#include <switch.h>
|
||||
#include <jrtp4c.h>
|
||||
#include <jrtplib3/jrtp4c.h>
|
||||
#include <eXosip2/eXosip.h>
|
||||
#include <osip2/osip_mt.h>
|
||||
#include <osipparser2/osip_rfc3264.h>
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/NODEFAULTLIB:LIBCMT"
|
||||
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib"
|
||||
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib osipparser2.lib osip2.lib"
|
||||
ShowProgress="0"
|
||||
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"
|
||||
LinkIncremental="2"
|
||||
@@ -149,7 +149,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib jthread.lib osipparser2.lib osip2.lib"
|
||||
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib eXosip.lib jrtplib.lib osipparser2.lib osip2.lib"
|
||||
OutputFile="..\..\..\..\w32\vsnet\$(OutDir)/mod/mod_exosip.dll"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\apr\Release";"$(InputDir)..\..\..\..\libs\jrtp4c\w32\Release";"$(InputDir)..\..\..\..\libs\jrtplib\Release";"$(InputDir)..\..\..\..\libs\jthread-1.1.2\Release";"$(InputDir)..\..\..\..\libs\libeXosip2\platform\vsnet\Release";"$(InputDir)..\..\..\..\libs\osip\platform\vsnet\Release""
|
||||
@@ -194,10 +194,6 @@
|
||||
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\..\..\libs\jrtp4c\src\jrtp4c.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\mod_exosip.c"
|
||||
>
|
||||
|
||||
Reference in new issue
Block a user