Skip to content

F
freeswitch
提交 aea6b816 authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

freeswitch win32 reorg and cleanup part 1. Everything works but mod_exosip 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@56 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 c0dedec3
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 151 行增加 和 47 行删除
libs/jrtp4c/w32/msvc/jrtp4c.sln → libs/jrtp4c/w32/jrtp4c.sln
浏览文件 @ aea6b816
 
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "..\jrtp4c\jrtp4c.vcproj", "{E85B3E1F-B671-4E84-9F09-90F61A27D783}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "jrtp4c.vcproj", "{E85B3E1F-B671-4E84-9F09-90F61A27D783}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{4009F58A-E333-424B-A868-7E82804DD055} = {4009F58A-E333-424B-A868-7E82804DD055} {4009F58A-E333-424B-A868-7E82804DD055} = {4009F58A-E333-424B-A868-7E82804DD055}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\..\jthread\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\jthread-1.1.2\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\..\jrtplib\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\jrtplib-3.3.0\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {96A714AE-BE53-4EFF-8569-C3809AD4F3B6} {96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {96A714AE-BE53-4EFF-8569-C3809AD4F3B6}
EndProjectSection EndProjectSection
......
libs/jrtp4c/w32/jrtp4c/jrtp4c.vcproj → libs/jrtp4c/w32/jrtp4c.vcproj
浏览文件 @ aea6b816
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D WIN32" AdditionalOptions="/D WIN32"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\..\jthread\src;..\..\..\jrtplib\src;..\..\src" AdditionalIncludeDirectories=""$(ProjectDir)..\..\jthread-1.1.2\src";"$(ProjectDir)..\..\jrtplib-3.3.0\src";"$(ProjectDir)..\src""
RuntimeLibrary="1" RuntimeLibrary="1"
/> />
<Tool <Tool
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
> >
...@@ -92,6 +93,7 @@ ...@@ -92,6 +93,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\jthread-1.1.2\src&quot;;&quot;$(ProjectDir)..\..\jrtplib-3.3.0\src&quot;;&quot;$(ProjectDir)..\src&quot;"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -140,7 +142,7 @@ ...@@ -140,7 +142,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath="..\..\src\jrtp4c.cpp" RelativePath="..\src\jrtp4c.cpp"
> >
</File> </File>
</Filter> </Filter>
...@@ -150,7 +152,7 @@ ...@@ -150,7 +152,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath="..\..\src\jrtp4c.h" RelativePath="..\src\jrtp4c.h"
> >
</File> </File>
</Filter> </Filter>
......
src/mod/mod_exosip/mod_exosip.c
浏览文件 @ aea6b816
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define HAVE_APR #define HAVE_APR
#include <switch.h> #include <switch.h>
#include <jrtp4c.h> #include <jrtp4c.h>
#include <eXosip2/eXosip.h> #include <eXosip/eXosip.h>
#include <osip2/osip_mt.h> #include <osip2/osip_mt.h>
#include <osipparser2/osip_rfc3264.h> #include <osipparser2/osip_rfc3264.h>
#include <osipparser2/osip_port.h> #include <osipparser2/osip_port.h>
......
w32/vsnet/FreeSwitchCore.vcproj
浏览文件 @ aea6b816
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\..\apr-1.2.2\include&quot;" AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\libs\apr-1.2.2\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="copy $(Projectdir)..\..\libs\apr-1.2.2\Debug\*.dll $(Outdir)"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
...@@ -121,7 +122,7 @@ ...@@ -121,7 +122,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(InputDir)include;$(InputDir)..\libs\apr-1.2.2\include" AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\libs\apr-1.2.2\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -173,6 +174,7 @@ ...@@ -173,6 +174,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="copy $(Projectdir)..\..\libs\apr-1.2.2\Release\*.dll $(Outdir)"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>
......
w32/vsnet/Freeswitch.sln
浏览文件 @ aea6b816
差异被折叠。
w32/vsnet/GetLibs.bat
浏览文件 @ aea6b816
...@@ -3,10 +3,10 @@ ECHO **************************************************************** ...@@ -3,10 +3,10 @@ ECHO ****************************************************************
ECHO ************** VARIABLE SETUP ***************** ECHO ************** VARIABLE SETUP *****************
ECHO **************************************************************** ECHO ****************************************************************
for /f %%i in ('cscript /Nologo .\tools\Fulldir.vbs .\..\..\..\..') DO SET BASEDIR=%%i for /f %%i in ('cscript /Nologo .\tools\Fulldir.vbs .\..\..') DO SET BASEDIR=%%i
set UTILSDIR=%BASEDIR%\src\freeswitch\platform\vsnet\Tools set UTILSDIR=%BASEDIR%\w32\vsnet\Tools
set INCLUDEDIR=%BASEDIR%\include set INCLUDEDIR=%BASEDIR%\include
set LIBSRCDIR=%BASEDIR%\src set LIBSRCDIR=%BASEDIR%\libs
set DEBUGLIBBINDIR=%BASEDIR%\debuglib set DEBUGLIBBINDIR=%BASEDIR%\debuglib
set WGET=cscript %UTILSDIR%\wget.vbs set WGET=cscript %UTILSDIR%\wget.vbs
set TAR=%UTILSDIR%\tar.exe set TAR=%UTILSDIR%\tar.exe
...@@ -19,19 +19,19 @@ set UNIX2DOS=%UTILSDIR%\unix2dos.vbs ...@@ -19,19 +19,19 @@ set UNIX2DOS=%UTILSDIR%\unix2dos.vbs
set APRDIR=apr-1.2.2 set APRDIR=apr-1.2.2
set APRTAR=%APRDIR%.tar.gz set APRTAR=%APRDIR%.tar.gz
set APRURL=ftp://ftp.wayne.edu/apache/apr/ set APRURL=ftp://ftp.wayne.edu/apache/apr/
set APRDESTDIR=apr set APRDESTDIR=%APRDIR%
REM set CCRTPDIR=ccrtp-1.3.5 set JRTPDIR=jrtplib-3.3.0
REM set CCRTPTAR=%CCRTPDIR%.tar.gz set JRTPTAR=%JRTPDIR%.tar.gz
REM set CCRTPURL=ftp://ftp.gnu.org/pub/gnu/ccrtp/ set JRTPURL=http://research.edm.luc.ac.be/jori/jrtplib/
REM set CCRTPDESTDIR=ccrtp set JRTPDESTDIR=%JRTPDIR%
REM set CCPPDIR=commoncpp2-1.3.21 set JTHREADDIR=jthread-1.1.2
REM set CCPPTAR=%CCPPDIR%.tar.gz set JTHREADTAR=%JTHREADDIR%.tar.gz
REM set CCPPURL=ftp://ftp.gnu.org/gnu/commoncpp/ set JTHREADURL=http://research.edm.luc.ac.be/jori/jthread/
REM set CCPPDESTDIR=commoncpp2 set JTHREADDESTDIR=%JTHREADDIR%
set EXOSIPDIR=libeXosip-0.9.0 set EXOSIPDIR=libeXosip-0.9.0
set EXOSIPTAR=%EXOSIPDIR%.tar.gz set EXOSIPTAR=%EXOSIPDIR%.tar.gz
set EXOSIPURL=http://www.antisip.com/download/ set EXOSIPURL=http://www.antisip.com/download/
set EXOSIPDESTDIR=eXosip set EXOSIPDESTDIR=%EXOSIPDIR%
set OSIPDIR=libosip2-2.2.1 set OSIPDIR=libosip2-2.2.1
set OSIPTAR=%OSIPDIR%.tar.gz set OSIPTAR=%OSIPDIR%.tar.gz
set OSIPURL=http://www.antisip.com/download/ set OSIPURL=http://www.antisip.com/download/
...@@ -40,7 +40,7 @@ set OSIPDESTDIR=libosip2-2.2.0 ...@@ -40,7 +40,7 @@ set OSIPDESTDIR=libosip2-2.2.0
IF NOT EXIST %INCLUDEDIR% md %INCLUDEDIR% IF NOT EXIST %INCLUDEDIR% md %INCLUDEDIR%
IF NOT EXIST %DEBUGLIBBINDIR% md %DEBUGLIBBINDIR% IF NOT EXIST %DEBUGLIBBINDIR% md %DEBUGLIBBINDIR%
IF NOT EXIST %LIBSRCDIR% md %LIBSRCDIR% IF NOT EXIST %LIBSRCDIR% md %LIBSRCDIR%
cd %LIBSRCDIR%
ECHO **************************************************************** ECHO ****************************************************************
ECHO ************** DOWNLOADS ***************** ECHO ************** DOWNLOADS *****************
...@@ -51,9 +51,12 @@ IF NOT EXIST %TAR% %WGET% %TARURL2% %UTILSDIR% ...@@ -51,9 +51,12 @@ IF NOT EXIST %TAR% %WGET% %TARURL2% %UTILSDIR%
IF NOT EXIST %GUNZIP% %WGET% %GUNZIPURL% %UTILSDIR% IF NOT EXIST %GUNZIP% %WGET% %GUNZIPURL% %UTILSDIR%
IF NOT EXIST %GUNZIP% %WGET% %GUNZIPURL2% %UTILSDIR% IF NOT EXIST %GUNZIP% %WGET% %GUNZIPURL2% %UTILSDIR%
cd %LIBSRCDIR%
IF NOT EXIST %APRTAR% IF NOT EXIST %APRDESTDIR% %WGET% %APRURL%%APRTAR% & %GUNZIP% < %APRTAR% | %TAR% xvf - & ren %APRDIR% %APRDESTDIR% & del %APRTAR% IF NOT EXIST %APRTAR% IF NOT EXIST %APRDESTDIR% %WGET% %APRURL%%APRTAR% & %GUNZIP% < %APRTAR% | %TAR% xvf - & ren %APRDIR% %APRDESTDIR% & del %APRTAR%
IF NOT EXIST %EXOSIPTAR% IF NOT EXIST %EXOSIPDESTDIR% %WGET% %EXOSIPURL%%EXOSIPTAR% & %GUNZIP% < %EXOSIPTAR% | %TAR% xvf - & ren %EXOSIPDIR% %EXOSIPDESTDIR% & del %EXOSIPTAR% IF NOT EXIST %EXOSIPTAR% IF NOT EXIST %EXOSIPDESTDIR% %WGET% %EXOSIPURL%%EXOSIPTAR% & %GUNZIP% < %EXOSIPTAR% | %TAR% xvf - & ren %EXOSIPDIR% %EXOSIPDESTDIR% & del %EXOSIPTAR%
IF NOT EXIST %OSIPTAR% IF NOT EXIST %OSIPDESTDIR% %WGET% %OSIPURL%%OSIPTAR% & %GUNZIP% < %OSIPTAR% | %TAR% xvf - & ren %OSIPDIR% %OSIPDESTDIR% & del %OSIPTAR% IF NOT EXIST %OSIPTAR% IF NOT EXIST %OSIPDESTDIR% %WGET% %OSIPURL%%OSIPTAR% & %GUNZIP% < %OSIPTAR% | %TAR% xvf - & ren %OSIPDIR% %OSIPDESTDIR% & del %OSIPTAR%
IF NOT EXIST %JTHREADTAR% IF NOT EXIST %JTHREADDESTDIR% %WGET% %JTHREADURL%%JTHREADTAR% & %GUNZIP% < %JTHREADTAR% | %TAR% xvf - & ren %JTHREADDIR% %JTHREADDESTDIR% & del %JTHREADTAR%
IF NOT EXIST %JRTPTAR% IF NOT EXIST %JRTPDESTDIR% %WGET% %JRTPURL%%JRTPTAR% & %GUNZIP% < %JRTPTAR% | %TAR% xvf - & ren %JRTPDIR% %JRTPDESTDIR% & del %JRTPTAR%
ECHO **************************************************************** ECHO ****************************************************************
...@@ -90,6 +93,7 @@ IF NOT EXIST libapr.vcproj cscript %UTILSDIR%\upgrade.vbs libapr.dsp libapr.vcpr ...@@ -90,6 +93,7 @@ IF NOT EXIST libapr.vcproj cscript %UTILSDIR%\upgrade.vbs libapr.dsp libapr.vcpr
REM %DEVENV% libapr.vcproj /build Release REM %DEVENV% libapr.vcproj /build Release
copy %LIBSRCDIR%\%APRDESTDIR%\debug\*.lib %DEBUGLIBBINDIR% copy %LIBSRCDIR%\%APRDESTDIR%\debug\*.lib %DEBUGLIBBINDIR%
copy %LIBSRCDIR%\%APRDESTDIR%\debug\*.dll %DEBUGLIBBINDIR% copy %LIBSRCDIR%\%APRDESTDIR%\debug\*.dll %DEBUGLIBBINDIR%
cd %LIBSRCDIR%
ECHO **************************************************************** ECHO ****************************************************************
ECHO ************** OSIP BUILD ***************** ECHO ************** OSIP BUILD *****************
...@@ -117,8 +121,13 @@ IF NOT EXIST %INCLUDEDIR%\eXosip copy "%LIBSRCDIR%\%EXOSIPDESTDIR%\include\eXosi ...@@ -117,8 +121,13 @@ IF NOT EXIST %INCLUDEDIR%\eXosip copy "%LIBSRCDIR%\%EXOSIPDESTDIR%\include\eXosi
REM %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj /build Release REM %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj /build Release
copy %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\debug\*.lib %DEBUGLIBBINDIR% copy %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\debug\*.lib %DEBUGLIBBINDIR%
ECHO ****************************************************************
ECHO ************** JRTP BUILD *****************
ECHO ****************************************************************
%DEVENV% %LIBSRCDIR%\jrtp4c\jrtp4c.sln /build Debug
:END :END
cd %BASEDIR% cd %UTILSDIR%\..
w32/vsnet/mod_exosip.vcproj
浏览文件 @ aea6b816
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE" AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\src\include;&quot;$(InputDir)..\..\..\libs\apr-1.2.2\include&quot;;..\..\..\eXosip\include;..\..\..\osip\include;..\..\..\jrtp4c\src" AdditionalIncludeDirectories="..\..\src\include;&quot;$(InputDir)..\..\..\libs\apr-1.2.2\include&quot;;&quot;..\..\libs\libeXosip-0.9.0\include&quot;;&quot;..\..\libs\libosip2-2.2.0\include&quot;;..\..\libs\jrtp4c\src"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
GeneratePreprocessedFile="0" GeneratePreprocessedFile="0"
MinimalRebuild="true" MinimalRebuild="true"
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\libs\apr-1.2.2\include&quot;;&quot;$(InputDir)libs\eXosip\include&quot;;&quot;$(InputDir)libs\osip\include&quot;;&quot;$(InputDir)libs\common\src&quot;" AdditionalIncludeDirectories="..\..\src\include;&quot;$(InputDir)..\..\..\libs\apr-1.2.2\include&quot;;&quot;..\..\libs\libeXosip-0.9.0\include&quot;;&quot;..\..\libs\libosip2-2.2.0\include&quot;;..\..\libs\jrtp4c\src"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Ws2_32.lib Iphlpapi.lib" AdditionalDependencies="Ws2_32.lib Iphlpapi.lib libcpmt.lib"
OutputFile="$(OutDir)/mod/mod_exosip.dll" OutputFile="$(OutDir)/mod/mod_exosip.dll"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
...@@ -189,15 +189,15 @@ ...@@ -189,15 +189,15 @@
/> />
<ProjectReference <ProjectReference
ReferencedProjectIdentifier="{4EA67539-9EE9-4065-BD39-87E517FD8262}" ReferencedProjectIdentifier="{4EA67539-9EE9-4065-BD39-87E517FD8262}"
RelativePathToProject="..\..\..\eXosip\platform\vsnet\eXosip.vcproj" RelativePathToProject="..\..\libs\libeXosip-0.9.0\platform\windows\eXosip.vcproj"
/> />
<ProjectReference <ProjectReference
ReferencedProjectIdentifier="{85255507-5D16-4218-85E2-F683BB2F04DA}" ReferencedProjectIdentifier="{85255507-5D16-4218-85E2-F683BB2F04DA}"
RelativePathToProject="..\..\..\osip\platform\vsnet\osip2.vcproj" RelativePathToProject="..\..\libs\libosip2-2.2.0\platform\vsnet\osip2.vcproj"
/> />
<ProjectReference <ProjectReference
ReferencedProjectIdentifier="{44F46B7E-0E51-4304-9735-330DFBAB41E5}" ReferencedProjectIdentifier="{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
RelativePathToProject="..\..\..\osip\platform\vsnet\osipparser2.vcproj" RelativePathToProject="..\..\libs\libosip2-2.2.0\platform\vsnet\osipparser2.vcproj"
/> />
</References> </References>
<Files> <Files>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论