Skip to content

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

move windows build to use the in tree apr, apr-util and pcre 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3740 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 d7ad197e
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 444 行增加 和 491 行删除
Freeswitch.sln
浏览文件 @ 493cbcd3
差异被折叠。
libs/win32/apr-util/xml.vcproj
浏览文件 @ 493cbcd3
......@@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\"
AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;VERSION=\"expat_1.95.2\""
StringPooling="true"
RuntimeLibrary="2"
......@@ -118,7 +118,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\"
AdditionalIncludeDirectories="$(ProjectDir)..\..\apr-util\xml\expat\lib\"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;VERSION=\"expat_1.95.2\""
RuntimeLibrary="3"
PrecompiledHeaderFile=".\LibD/xml.pch"
......@@ -171,7 +171,7 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmlparse.c"
RelativePath="..\..\apr-util\xml\expat\lib\xmlparse.c"
>
<FileConfiguration
Name="Release|Win32"
......@@ -193,7 +193,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmlrole.c"
RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.c"
>
<FileConfiguration
Name="Release|Win32"
......@@ -215,7 +215,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok.c"
RelativePath="..\..\apr-util\xml\expat\lib\xmltok.c"
>
<FileConfiguration
Name="Release|Win32"
......@@ -237,7 +237,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok_impl.c"
RelativePath="..\..\apr-util\xml\expat\lib\xmltok_impl.c"
>
<FileConfiguration
Name="Release|Win32"
......@@ -261,7 +261,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok_ns.c"
RelativePath="..\..\apr-util\xml\expat\lib\xmltok_ns.c"
>
<FileConfiguration
Name="Release|Win32"
......@@ -290,47 +290,47 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\ascii.h"
RelativePath="..\..\apr-util\xml\expat\lib\ascii.h"
>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\asciitab.h"
RelativePath="..\..\apr-util\xml\expat\lib\asciitab.h"
>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\config.h"
RelativePath="..\..\apr-util\xml\expat\lib\config.h"
>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\expat.h"
RelativePath="..\..\apr-util\xml\expat\lib\expat.h"
>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\iasciitab.h"
RelativePath="..\..\apr-util\xml\expat\lib\iasciitab.h"
>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\latin1tab.h"
RelativePath="..\..\apr-util\xml\expat\lib\latin1tab.h"
>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\nametab.h"
RelativePath="..\..\apr-util\xml\expat\lib\nametab.h"
>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\utf8tab.h"
RelativePath="..\..\apr-util\xml\expat\lib\utf8tab.h"
>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmlrole.h"
RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.h"
>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok.h"
RelativePath="..\..\apr-util\xml\expat\lib\xmltok.h"
>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\xmltok_impl.h"
RelativePath="..\..\apr-util\xml\expat\lib\xmltok_impl.h"
>
</File>
</Filter>
......@@ -338,7 +338,7 @@
Name="Generated Header Files"
>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\expat.h.in"
RelativePath="..\..\apr-util\xml\expat\lib\expat.h.in"
>
<FileConfiguration
Name="Release|Win32"
......@@ -346,8 +346,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Creating expat.h from expat.h.in"
CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h.in &gt; $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h&#x0D;&#x0A;"
Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h"
CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h&#x0D;&#x0A;"
Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
/>
</FileConfiguration>
<FileConfiguration
......@@ -356,13 +356,13 @@
<Tool
Name="VCCustomBuildTool"
Description="Creating expat.h from expat.h.in"
CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h.in &gt; $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h&#x0D;&#x0A;"
Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\expat.h"
CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h&#x0D;&#x0A;"
Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h"
RelativePath="..\..\apr-util\xml\expat\lib\winconfig.h"
>
<FileConfiguration
Name="Release|Win32"
......@@ -370,8 +370,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Creating config.h from winconfig.h"
CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h &gt; $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h&#x0D;&#x0A;"
Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h"
CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h&#x0D;&#x0A;"
Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
/>
</FileConfiguration>
<FileConfiguration
......@@ -380,14 +380,14 @@
<Tool
Name="VCCustomBuildTool"
Description="Creating config.h from winconfig.h"
CommandLine="if not exist $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\winconfig.h &gt; $(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h&#x0D;&#x0A;"
Outputs="$(ProjectDir)..\..\apr-util-1.2.7\xml\expat\lib\config.h"
CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h &gt; $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h&#x0D;&#x0A;"
Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
/>
</FileConfiguration>
</File>
</Filter>
<File
RelativePath="..\..\apr-util-1.2.7\xml\expat\lib\ReadMe.txt"
RelativePath="..\..\apr-util\xml\expat\lib\ReadMe.txt"
>
</File>
</Files>
......
libs/win32/pcre/libpcre.vcproj
浏览文件 @ 493cbcd3
......@@ -97,7 +97,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre-6.7\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
......@@ -183,7 +183,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre-6.7\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
......@@ -254,7 +254,7 @@
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile="$(InputDir)..\..\pcre-6.7\pcre.def"
ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
ImportLibrary="$(IntDir)\$(ProjectName).lib"
......@@ -285,7 +285,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre-6.7\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
......@@ -356,7 +356,7 @@
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile="$(InputDir)..\..\pcre-6.7\pcre.def"
ModuleDefinitionFile="$(InputDir)..\..\pcre\pcre.def"
ProgramDatabaseFile="$(IntDir)\$(ProjectName).pdb"
ImportLibrary="$(IntDir)\$(ProjectName).lib"
TargetMachine="1"
......@@ -386,7 +386,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre-6.7\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
CommandLine="if not exist &quot;$(ProjectDir)..\..\include\&quot; md &quot;$(ProjectDir)..\..\include\&quot;&#x0D;&#x0A;xcopy &quot;$(ProjectDir)..\..\pcre\pcre.h&quot; &quot;$(ProjectDir)..\..\include\&quot; /C /D /Y&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
......@@ -402,11 +402,11 @@
>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_compile.c"
RelativePath="..\..\pcre\pcre_compile.c"
>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_config.c"
RelativePath="..\..\pcre\pcre_config.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -446,7 +446,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_dfa_exec.c"
RelativePath="..\..\pcre\pcre_dfa_exec.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -486,7 +486,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_exec.c"
RelativePath="..\..\pcre\pcre_exec.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -526,7 +526,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_fullinfo.c"
RelativePath="..\..\pcre\pcre_fullinfo.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -566,7 +566,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_get.c"
RelativePath="..\..\pcre\pcre_get.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -606,7 +606,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_globals.c"
RelativePath="..\..\pcre\pcre_globals.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -646,7 +646,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_info.c"
RelativePath="..\..\pcre\pcre_info.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -686,7 +686,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_maketables.c"
RelativePath="..\..\pcre\pcre_maketables.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -726,7 +726,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_ord2utf8.c"
RelativePath="..\..\pcre\pcre_ord2utf8.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -766,7 +766,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_refcount.c"
RelativePath="..\..\pcre\pcre_refcount.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -806,7 +806,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_study.c"
RelativePath="..\..\pcre\pcre_study.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -846,7 +846,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_tables.c"
RelativePath="..\..\pcre\pcre_tables.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -886,7 +886,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_try_flipped.c"
RelativePath="..\..\pcre\pcre_try_flipped.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -926,11 +926,11 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_ucp_searchfuncs.c"
RelativePath="..\..\pcre\pcre_ucp_searchfuncs.c"
>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_valid_utf8.c"
RelativePath="..\..\pcre\pcre_valid_utf8.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -970,7 +970,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_version.c"
RelativePath="..\..\pcre\pcre_version.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -1010,7 +1010,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_xclass.c"
RelativePath="..\..\pcre\pcre_xclass.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -1050,7 +1050,7 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\pcre-6.7\pcreposix.c"
RelativePath="..\..\pcre\pcreposix.c"
>
<FileConfiguration
Name="Debug|Win32"
......@@ -1099,7 +1099,7 @@
>
</File>
<File
RelativePath="..\..\pcre-6.7\internal.h"
RelativePath="..\..\pcre\internal.h"
>
</File>
<File
......@@ -1107,11 +1107,11 @@
>
</File>
<File
RelativePath="..\..\pcre-6.7\pcre_internal.h"
RelativePath="..\..\pcre\pcre_internal.h"
>
</File>
<File
RelativePath="..\..\pcre-6.7\pcreposix.h"
RelativePath="..\..\pcre\pcreposix.h"
>
</File>
</Filter>
......
libs/win32/pcre/pcre_chartables.c.vcproj
浏览文件 @ 493cbcd3
......@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\pcre-6.7\"
AdditionalIncludeDirectories="..\..\pcre\"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
......@@ -120,7 +120,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\pcre-6.7\"
AdditionalIncludeDirectories="..\..\pcre\"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论