Merge branch 'master' of https://github.com/buddhi1980/mandelbulber2

buddhi1980 · May 31, 2017 · ab5b733 · ab5b733
2 parents 04ce19d + 372316f
commit ab5b733
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/mandelbulber2/msvc/mandelbulber2.vcxproj b/mandelbulber2/msvc/mandelbulber2.vcxproj
@@ -941,8 +941,8 @@
     <Import Project="..\..\packages\libtiff-msvc14-x64.4.0.7.7799\build\native\libtiff-msvc14-x64.targets" Condition="Exists('..\..\packages\libtiff-msvc14-x64.4.0.7.7799\build\native\libtiff-msvc14-x64.targets')" />
     <Import Project="..\..\packages\libpng-msvc14-x86.1.6.29.7801\build\native\libpng-msvc14-x86.targets" Condition="Exists('..\..\packages\libpng-msvc14-x86.1.6.29.7801\build\native\libpng-msvc14-x86.targets')" />
     <Import Project="..\..\packages\libpng-msvc14-x64.1.6.29.7801\build\native\libpng-msvc14-x64.targets" Condition="Exists('..\..\packages\libpng-msvc14-x64.1.6.29.7801\build\native\libpng-msvc14-x64.targets')" />
-    <Import Project="..\..\packages\libsndfile-msvc14-x64.1.0.28.7789\build\native\libsndfile-msvc14-x64.targets" Condition="Exists('..\..\packages\libsndfile-msvc14-x64.1.0.28.7789\build\native\libsndfile-msvc14-x64.targets')" />
-    <Import Project="..\..\packages\libsndfile-msvc14-x86.1.0.28.7789\build\native\libsndfile-msvc14-x86.targets" Condition="Exists('..\..\packages\libsndfile-msvc14-x86.1.0.28.7789\build\native\libsndfile-msvc14-x86.targets')" />
+    <Import Project="..\..\packages\libsndfile-msvc14-x64.1.0.27.7788\build\native\libsndfile-msvc14-x64.targets" Condition="Exists('..\..\packages\libsndfile-msvc14-x64.1.0.27.7788\build\native\libsndfile-msvc14-x64.targets')" />
+    <Import Project="..\..\packages\libsndfile-msvc14-x86.1.0.27.7788\build\native\libsndfile-msvc14-x86.targets" Condition="Exists('..\..\packages\libsndfile-msvc14-x86.1.0.27.7788\build\native\libsndfile-msvc14-x86.targets')" />
     <Import Project="..\..\packages\lzo-msvc14-x86.2.10.0.7802\build\native\lzo-msvc14-x86.targets" Condition="Exists('..\..\packages\lzo-msvc14-x86.2.10.0.7802\build\native\lzo-msvc14-x86.targets')" />
     <Import Project="..\..\packages\lzo-msvc14-x64.2.10.0.7802\build\native\lzo-msvc14-x64.targets" Condition="Exists('..\..\packages\lzo-msvc14-x64.2.10.0.7802\build\native\lzo-msvc14-x64.targets')" />
     <Import Project="..\..\packages\opencl-nug.0.777.10\build\native\opencl-nug.targets" Condition="Exists('..\..\packages\opencl-nug.0.777.10\build\native\opencl-nug.targets')" />
@@ -976,8 +976,8 @@
     <Error Condition="!Exists('..\..\packages\libtiff-msvc14-x64.4.0.7.7799\build\native\libtiff-msvc14-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libtiff-msvc14-x64.4.0.7.7799\build\native\libtiff-msvc14-x64.targets'))" />
     <Error Condition="!Exists('..\..\packages\libpng-msvc14-x86.1.6.29.7801\build\native\libpng-msvc14-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libpng-msvc14-x86.1.6.29.7801\build\native\libpng-msvc14-x86.targets'))" />
     <Error Condition="!Exists('..\..\packages\libpng-msvc14-x64.1.6.29.7801\build\native\libpng-msvc14-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libpng-msvc14-x64.1.6.29.7801\build\native\libpng-msvc14-x64.targets'))" />
-    <Error Condition="!Exists('..\..\packages\libsndfile-msvc14-x64.1.0.28.7789\build\native\libsndfile-msvc14-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libsndfile-msvc14-x64.1.0.28.7789\build\native\libsndfile-msvc14-x64.targets'))" />
-    <Error Condition="!Exists('..\..\packages\libsndfile-msvc14-x86.1.0.28.7789\build\native\libsndfile-msvc14-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libsndfile-msvc14-x86.1.0.28.7789\build\native\libsndfile-msvc14-x86.targets'))" />
+    <Error Condition="!Exists('..\..\packages\libsndfile-msvc14-x64.1.0.27.7788\build\native\libsndfile-msvc14-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libsndfile-msvc14-x64.1.0.27.7788\build\native\libsndfile-msvc14-x64.targets'))" />
+    <Error Condition="!Exists('..\..\packages\libsndfile-msvc14-x86.1.0.27.7788\build\native\libsndfile-msvc14-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libsndfile-msvc14-x86.1.0.27.7788\build\native\libsndfile-msvc14-x86.targets'))" />
     <Error Condition="!Exists('..\..\packages\lzo-msvc14-x86.2.10.0.7802\build\native\lzo-msvc14-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\lzo-msvc14-x86.2.10.0.7802\build\native\lzo-msvc14-x86.targets'))" />
     <Error Condition="!Exists('..\..\packages\lzo-msvc14-x64.2.10.0.7802\build\native\lzo-msvc14-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\lzo-msvc14-x64.2.10.0.7802\build\native\lzo-msvc14-x64.targets'))" />
     <Error Condition="!Exists('..\..\packages\opencl-nug.0.777.10\build\native\opencl-nug.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\opencl-nug.0.777.10\build\native\opencl-nug.targets'))" />

diff --git a/mandelbulber2/msvc/mandelbulber2_k1om.vcxproj b/mandelbulber2/msvc/mandelbulber2_k1om.vcxproj
@@ -943,8 +943,8 @@
     <Import Project="..\..\packages\libtiff-msvc14-x64.4.0.7.7799\build\native\libtiff-msvc14-x64.targets" Condition="Exists('..\..\packages\libtiff-msvc14-x64.4.0.7.7799\build\native\libtiff-msvc14-x64.targets')" />
     <Import Project="..\..\packages\libpng-msvc14-x86.1.6.29.7801\build\native\libpng-msvc14-x86.targets" Condition="Exists('..\..\packages\libpng-msvc14-x86.1.6.29.7801\build\native\libpng-msvc14-x86.targets')" />
     <Import Project="..\..\packages\libpng-msvc14-x64.1.6.29.7801\build\native\libpng-msvc14-x64.targets" Condition="Exists('..\..\packages\libpng-msvc14-x64.1.6.29.7801\build\native\libpng-msvc14-x64.targets')" />
-    <Import Project="..\..\packages\libsndfile-msvc14-x64.1.0.28.7789\build\native\libsndfile-msvc14-x64.targets" Condition="Exists('..\..\packages\libsndfile-msvc14-x64.1.0.28.7789\build\native\libsndfile-msvc14-x64.targets')" />
-    <Import Project="..\..\packages\libsndfile-msvc14-x86.1.0.28.7789\build\native\libsndfile-msvc14-x86.targets" Condition="Exists('..\..\packages\libsndfile-msvc14-x86.1.0.28.7789\build\native\libsndfile-msvc14-x86.targets')" />
+    <Import Project="..\..\packages\libsndfile-msvc14-x64.1.0.27.7788\build\native\libsndfile-msvc14-x64.targets" Condition="Exists('..\..\packages\libsndfile-msvc14-x64.1.0.27.7788\build\native\libsndfile-msvc14-x64.targets')" />
+    <Import Project="..\..\packages\libsndfile-msvc14-x86.1.0.27.7788\build\native\libsndfile-msvc14-x86.targets" Condition="Exists('..\..\packages\libsndfile-msvc14-x86.1.0.27.7788\build\native\libsndfile-msvc14-x86.targets')" />
     <Import Project="..\..\packages\lzo-msvc14-x86.2.10.0.7802\build\native\lzo-msvc14-x86.targets" Condition="Exists('..\..\packages\lzo-msvc14-x86.2.10.0.7802\build\native\lzo-msvc14-x86.targets')" />
     <Import Project="..\..\packages\lzo-msvc14-x64.2.10.0.7802\build\native\lzo-msvc14-x64.targets" Condition="Exists('..\..\packages\lzo-msvc14-x64.2.10.0.7802\build\native\lzo-msvc14-x64.targets')" />
     <Import Project="..\..\packages\opencl-nug.0.777.10\build\native\opencl-nug.targets" Condition="Exists('..\..\packages\opencl-nug.0.777.10\build\native\opencl-nug.targets')" />
@@ -978,8 +978,8 @@
     <Error Condition="!Exists('..\..\packages\libtiff-msvc14-x64.4.0.7.7799\build\native\libtiff-msvc14-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libtiff-msvc14-x64.4.0.7.7799\build\native\libtiff-msvc14-x64.targets'))" />
     <Error Condition="!Exists('..\..\packages\libpng-msvc14-x86.1.6.29.7801\build\native\libpng-msvc14-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libpng-msvc14-x86.1.6.29.7801\build\native\libpng-msvc14-x86.targets'))" />
     <Error Condition="!Exists('..\..\packages\libpng-msvc14-x64.1.6.29.7801\build\native\libpng-msvc14-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libpng-msvc14-x64.1.6.29.7801\build\native\libpng-msvc14-x64.targets'))" />
-    <Error Condition="!Exists('..\..\packages\libsndfile-msvc14-x64.1.0.28.7789\build\native\libsndfile-msvc14-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libsndfile-msvc14-x64.1.0.28.7789\build\native\libsndfile-msvc14-x64.targets'))" />
-    <Error Condition="!Exists('..\..\packages\libsndfile-msvc14-x86.1.0.28.7789\build\native\libsndfile-msvc14-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libsndfile-msvc14-x86.1.0.28.7789\build\native\libsndfile-msvc14-x86.targets'))" />
+    <Error Condition="!Exists('..\..\packages\libsndfile-msvc14-x64.1.0.27.7788\build\native\libsndfile-msvc14-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libsndfile-msvc14-x64.1.0.27.7788\build\native\libsndfile-msvc14-x64.targets'))" />
+    <Error Condition="!Exists('..\..\packages\libsndfile-msvc14-x86.1.0.27.7788\build\native\libsndfile-msvc14-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\libsndfile-msvc14-x86.1.0.27.7788\build\native\libsndfile-msvc14-x86.targets'))" />
     <Error Condition="!Exists('..\..\packages\lzo-msvc14-x86.2.10.0.7802\build\native\lzo-msvc14-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\lzo-msvc14-x86.2.10.0.7802\build\native\lzo-msvc14-x86.targets'))" />
     <Error Condition="!Exists('..\..\packages\lzo-msvc14-x64.2.10.0.7802\build\native\lzo-msvc14-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\lzo-msvc14-x64.2.10.0.7802\build\native\lzo-msvc14-x64.targets'))" />
     <Error Condition="!Exists('..\..\packages\opencl-nug.0.777.10\build\native\opencl-nug.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\opencl-nug.0.777.10\build\native\opencl-nug.targets'))" />

diff --git a/mandelbulber2/msvc/packages.config b/mandelbulber2/msvc/packages.config
@@ -12,8 +12,8 @@
   <package id="libjpeg-msvc14-x86" version="9.1.0.7796" targetFramework="native" />
   <package id="libpng-msvc14-x64" version="1.6.29.7801" targetFramework="native" />
   <package id="libpng-msvc14-x86" version="1.6.29.7801" targetFramework="native" />
-  <package id="libsndfile-msvc14-x64" version="1.0.28.7789" targetFramework="native" />
-  <package id="libsndfile-msvc14-x86" version="1.0.28.7789" targetFramework="native" />
+  <package id="libsndfile-msvc14-x64" version="1.0.27.7788" targetFramework="native" />
+  <package id="libsndfile-msvc14-x86" version="1.0.27.7788" targetFramework="native" />
   <package id="libtiff-msvc14-x64" version="4.0.7.7799" targetFramework="native" />
   <package id="libtiff-msvc14-x86" version="4.0.7.7799" targetFramework="native" />
   <package id="lzo-msvc14-x64" version="2.10.0.7802" targetFramework="native" />