Skip to content

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

Fix build of some deps in MSVC, added copying of conf dir and libapr-1.dll into… 

Fix build of some deps in MSVC, added copying of conf dir and libapr-1.dll into the output directory and setting the working directory to allow for launching in debug mode from the gui out of the box, disabled acutal building in GetLibs.bat for now, it is only downloading and setting up the lib src as necessary.  Still need to add jrtp4c into the core configure\makefile so it builds from there automatically and we can get rid of the other configure script for that lib individually.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@59 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 9dce3583
隐藏空白字符变更
内嵌 并排
正在显示 包含 14 行增加 和 40 行删除
libs/jrtp4c/configure.in
浏览文件 @ 90f17835
...@@ -16,7 +16,6 @@ AC_PROG_INSTALL ...@@ -16,7 +16,6 @@ AC_PROG_INSTALL
# Checks for header files. # Checks for header files.
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_HEADER_STDC AC_HEADER_STDC
#AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h])
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST AC_C_CONST
...@@ -30,7 +29,6 @@ AC_PROG_GCC_TRADITIONAL ...@@ -30,7 +29,6 @@ AC_PROG_GCC_TRADITIONAL
AC_FUNC_MALLOC AC_FUNC_MALLOC
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
AC_FUNC_STRFTIME AC_FUNC_STRFTIME
#AC_CHECK_FUNCS([gethostname gettimeofday localtime_r memmove memset socket strcasecmp strchr strdup strncasecmp strstr])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
......
libs/jrtp4c/w32/jrtp4c.sln
浏览文件 @ 90f17835
...@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "jrtp4c.vcproj", " ...@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "jrtp4c.vcproj", "
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\jthread-1.1.2\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-3.3.0\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\jrtplib\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.vcproj
浏览文件 @ 90f17835
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
AdditionalOptions="/D WIN32" AdditionalOptions="/D WIN32"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories=""$(ProjectDir)..\..\jthread-1.1.2\src";"$(ProjectDir)..\..\jrtplib\src";"$(ProjectDir)..\src"" AdditionalIncludeDirectories=""$(ProjectDir)..\..\jthread-1.1.2\src";"$(ProjectDir)..\..\jrtplib\src";"$(ProjectDir)..\src""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
RuntimeLibrary="1" RuntimeLibrary="1"
/> />
<Tool <Tool
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)" OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="4"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
...@@ -94,6 +95,7 @@ ...@@ -94,6 +95,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\jthread-1.1.2\src&quot;;&quot;$(ProjectDir)..\..\jrtplib\src&quot;;&quot;$(ProjectDir)..\src&quot;" AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\jthread-1.1.2\src&quot;;&quot;$(ProjectDir)..\..\jrtplib\src&quot;;&quot;$(ProjectDir)..\src&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -105,14 +107,11 @@ ...@@ -105,14 +107,11 @@
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLibrarianTool"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
/> />
<Tool
Name="VCManifestTool"
/>
<Tool <Tool
Name="VCXDCMakeTool" Name="VCXDCMakeTool"
/> />
...@@ -122,12 +121,6 @@ ...@@ -122,12 +121,6 @@
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
/> />
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
w32/vsnet/FreeSwitchCore.vcproj
浏览文件 @ 90f17835
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="copy $(Projectdir)..\..\libs\apr-1.2.2\Debug\*.dll $(Outdir)" CommandLine="copy $(Projectdir)..\..\libs\apr\Debug\*.dll $(Outdir)&#x0D;&#x0A;xcopy $(Projectdir)..\..\conf\*.* $(Outdir)\conf\ /C /D /Y"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="copy $(Projectdir)..\..\libs\apr-1.2.2\Release\*.dll $(Outdir)" CommandLine="copy $(Projectdir)..\..\libs\apr\Release\*.dll $(Outdir)&#x0D;&#x0A;xcopy $(Projectdir)..\..\conf\*.* $(Outdir)\conf\ /C /D /Y"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>
......
w32/vsnet/Freeswitch.sln
浏览文件 @ 90f17835
...@@ -63,7 +63,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomerachan", "mod_woom ...@@ -63,7 +63,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomerachan", "mod_woom
{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574} {13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "..\..\libs\apr-1.2.2\libapr.vcproj", "{13860EB7-038A-438F-898F-1032E42A5574}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "..\..\libs\apr\libapr.vcproj", "{13860EB7-038A-438F-898F-1032E42A5574}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "..\..\libs\osip\platform\vsnet\osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "..\..\libs\osip\platform\vsnet\osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
...@@ -81,7 +81,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "..\..\libs\jrtp4c ...@@ -81,7 +81,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "..\..\libs\jrtp4c
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\libs\jthread-1.1.2\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\libs\jthread-1.1.2\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\libs\jrtplib-3.3.0\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\libs\jrtplib\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
......
w32/vsnet/GetLibs.bat
浏览文件 @ 90f17835
REM @echo off @echo off
ECHO **************************************************************** ECHO ****************************************************************
ECHO ************** VARIABLE SETUP ***************** ECHO ************** VARIABLE SETUP *****************
ECHO **************************************************************** ECHO ****************************************************************
...@@ -37,8 +37,6 @@ set OSIPTAR=%OSIPDIR%.tar.gz ...@@ -37,8 +37,6 @@ set OSIPTAR=%OSIPDIR%.tar.gz
set OSIPURL=http://www.antisip.com/download/ set OSIPURL=http://www.antisip.com/download/
set OSIPDESTDIR=osip set OSIPDESTDIR=osip
IF NOT EXIST %INCLUDEDIR% md %INCLUDEDIR%
IF NOT EXIST %DEBUGLIBBINDIR% md %DEBUGLIBBINDIR%
IF NOT EXIST %LIBSRCDIR% md %LIBSRCDIR% IF NOT EXIST %LIBSRCDIR% md %LIBSRCDIR%
...@@ -86,7 +84,7 @@ ECHO **************************************************************** ...@@ -86,7 +84,7 @@ ECHO ****************************************************************
IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj %UNIX2DOS% %LIBSRCDIR%\%APRDESTDIR%\libapr.dsp IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj %UNIX2DOS% %LIBSRCDIR%\%APRDESTDIR%\libapr.dsp
IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj cscript %UTILSDIR%\upgrade.vbs %LIBSRCDIR%\%APRDESTDIR%\libapr.dsp %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj cscript %UTILSDIR%\upgrade.vbs %LIBSRCDIR%\%APRDESTDIR%\libapr.dsp %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj
%DEVENV% %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj /build Debug REM %DEVENV% %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj /build Debug
ECHO **************************************************************** ECHO ****************************************************************
...@@ -96,7 +94,7 @@ ECHO **************************************************************** ...@@ -96,7 +94,7 @@ ECHO ****************************************************************
del %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osipparser2.vcproj del %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osipparser2.vcproj
copy %UTILSDIR%\osipparser2.vcproj %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\ copy %UTILSDIR%\osipparser2.vcproj %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\
%DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /Upgrade %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /Upgrade
%DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /build Debug REM %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /build Debug
ECHO **************************************************************** ECHO ****************************************************************
...@@ -104,13 +102,13 @@ ECHO ************** EXOSIP BUILD ***************** ...@@ -104,13 +102,13 @@ ECHO ************** EXOSIP BUILD *****************
ECHO **************************************************************** ECHO ****************************************************************
%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /Upgrade %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /Upgrade
%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /build Debug REM %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /build Debug
ECHO **************************************************************** ECHO ****************************************************************
ECHO ************** JRTP BUILD ***************** ECHO ************** JRTP BUILD *****************
ECHO **************************************************************** ECHO ****************************************************************
%DEVENV% %LIBSRCDIR%\jrtp4c\w32\jrtp4c.sln /build Debug REM %DEVENV% %LIBSRCDIR%\jrtp4c\w32\jrtp4c.sln /build Debug
:END :END
cd %UTILSDIR%\.. cd %UTILSDIR%\..
......
w32/vsnet/mod_exosip.vcproj
浏览文件 @ 90f17835
...@@ -184,21 +184,6 @@ ...@@ -184,21 +184,6 @@
</Configuration> </Configuration>
</Configurations> </Configurations>
<References> <References>
<ProjectReference
ReferencedProjectIdentifier="{E3B37452-127D-4C22-BB33-3B08E23721DF}"
/>
<ProjectReference
ReferencedProjectIdentifier="{4EA67539-9EE9-4065-BD39-87E517FD8262}"
RelativePathToProject="..\..\libs\libeXosip2\platform\vsnet\eXosip.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{85255507-5D16-4218-85E2-F683BB2F04DA}"
RelativePathToProject="..\..\libs\osip\platform\vsnet\osip2.vcproj"
/>
<ProjectReference
ReferencedProjectIdentifier="{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
RelativePathToProject="..\..\libs\osip\platform\vsnet\osipparser2.vcproj"
/>
</References> </References>
<Files> <Files>
<Filter <Filter
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论