]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 560fd03)
FS-10690: [libblade] Added basedir.props from existing pending PR from Andrey Volk...
authorShane Bryldt <astaelan@gmail.com>
Mon, 2 Oct 2017 19:09:51 +0000 (13:09 -0600)
committerShane Bryldt <astaelan@gmail.com>
Mon, 2 Oct 2017 19:09:51 +0000 (13:09 -0600)
libs/libblade/libblade.vcxproj patch | blob | blame | history
libs/libblade/switchblade/switchblade.vcxproj patch | blob | blame | history
libs/libblade/test/bladec.vcxproj patch | blob | blame | history
libs/libblade/test/blades.vcxproj patch | blob | blame | history
libs/libblade/test/testcli.vcxproj patch | blob | blame | history
libs/libblade/test/testcon.vcxproj patch | blob | blame | history
w32/basedir.props [new file with mode: 0644] patch | blob
w32/pcre-version.props [new file with mode: 0644] patch | blob
w32/pcre.props [new file with mode: 0644] patch | blob

diff --git a/libs/libblade/libblade.vcxproj b/libs/libblade/libblade.vcxproj
index 32d80a5df89d1ef635fa2a181cd69c6f2c7e333e..9cc352f2e60423523bff51b259ed35673c2b8500 100644 (file)
--- a/libs/libblade/libblade.vcxproj
+++ b/libs/libblade/libblade.vcxproj
@@ -60,6 +60,7 @@
     <Import Project="..\..\w32\sodium.props" />
     <Import Project="..\..\w32\config.props" />
     <Import Project="..\..\w32\civetweb.props" />
+    <Import Project="..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -68,6 +69,7 @@
     <Import Project="..\..\w32\sodium.props" />
     <Import Project="..\..\w32\config.props" />
     <Import Project="..\..\w32\civetweb.props" />
+    <Import Project="..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -76,6 +78,7 @@
     <Import Project="..\..\w32\sodium.props" />
     <Import Project="..\..\w32\config.props" />
     <Import Project="..\..\w32\civetweb.props" />
+    <Import Project="..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -84,6 +87,7 @@
     <Import Project="..\..\w32\sodium.props" />
     <Import Project="..\..\w32\config.props" />
     <Import Project="..\..\w32\civetweb.props" />
+    <Import Project="..\..\w32\pcre.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/libs/libblade/switchblade/switchblade.vcxproj b/libs/libblade/switchblade/switchblade.vcxproj
index 2dff4e2714459ded1844c9942a224de8bd6de53a..8d994e6f21e3147f812a755bbceb91668add637d 100644 (file)
--- a/libs/libblade/switchblade/switchblade.vcxproj
+++ b/libs/libblade/switchblade/switchblade.vcxproj
@@ -62,6 +62,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -69,6 +70,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -76,6 +78,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -83,6 +86,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/libs/libblade/test/bladec.vcxproj b/libs/libblade/test/bladec.vcxproj
index 6539eb63b6fe1261025f9e2dc05b5f9d4e00943f..715e3641a953ab8d7775b201891dc80884407725 100644 (file)
--- a/libs/libblade/test/bladec.vcxproj
+++ b/libs/libblade/test/bladec.vcxproj
@@ -62,6 +62,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -69,6 +70,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -76,6 +78,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -83,6 +86,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/libs/libblade/test/blades.vcxproj b/libs/libblade/test/blades.vcxproj
index b82e67e746b2c599ac1749f74161f7ca62ba2f47..a9f48e92da57237c5133a3e99837bf48af550623 100644 (file)
--- a/libs/libblade/test/blades.vcxproj
+++ b/libs/libblade/test/blades.vcxproj
@@ -62,6 +62,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -69,6 +70,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -76,6 +78,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -83,6 +86,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/libs/libblade/test/testcli.vcxproj b/libs/libblade/test/testcli.vcxproj
index 5d4816df01306546ce11592369c2a0d0fe02d532..e86abfdb1c7641f62d44c7447598bcb124ab65f8 100644 (file)
--- a/libs/libblade/test/testcli.vcxproj
+++ b/libs/libblade/test/testcli.vcxproj
@@ -62,6 +62,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -69,6 +70,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -76,6 +78,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -83,6 +86,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/libs/libblade/test/testcon.vcxproj b/libs/libblade/test/testcon.vcxproj
index c93a3b62f096a2d55ff2029e1496d0c6bfc86f00..8740d494ea616dd44250d68dda108310575e995f 100644 (file)
--- a/libs/libblade/test/testcon.vcxproj
+++ b/libs/libblade/test/testcon.vcxproj
@@ -62,6 +62,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -69,6 +70,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -76,6 +78,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -83,6 +86,7 @@
     <Import Project="..\..\..\w32\sodium.props" />
     <Import Project="..\..\..\w32\config.props" />
     <Import Project="..\..\..\w32\civetweb.props" />
+    <Import Project="..\..\..\w32\pcre.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/w32/basedir.props b/w32/basedir.props
new file mode 100644 (file)
index 0000000..c35275b
--- /dev/null
+++ b/w32/basedir.props
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros" Condition=" '$(BaseDir)' == ''">
+      <BaseDir>$(MSBuildThisFileDirectory)..\</BaseDir>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/w32/pcre-version.props b/w32/pcre-version.props
new file mode 100644 (file)
index 0000000..58480c8
--- /dev/null
+++ b/w32/pcre-version.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="basedir.props"/>
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <PCREVersion>8.34</PCREVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PCREVersionImported>true</PCREVersionImported>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="PCREVersion">
+      <Value>$(PCREVersion)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/w32/pcre.props b/w32/pcre.props
new file mode 100644 (file)
index 0000000..a437bb4
--- /dev/null
+++ b/w32/pcre.props
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pcre-version.props" Condition=" '$(PCREVersionImported)' == ''"/>
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <PCREPropsImported>true</PCREPropsImported>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(BaseDir)libs\pcre-$(PCREVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PreprocessorDefinitions>PCRE_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
Mirror of https://github.com/signalwire/freeswitch.git