Skip to content

Commit

Permalink
Revert "update libsndfile-msvc14 nugget"
Browse files Browse the repository at this point in the history 
This reverts commit ec9801c.
  • Loading branch information
mancoast authored and mancoast committed May 31, 2017
1 parent 206b892 commit 372316f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions mandelbulber2/msvc/mandelbulber2.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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')" />
Expand Down Expand Up @@ -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'))" />
Expand Down
8 changes: 4 additions & 4 deletions mandelbulber2/msvc/mandelbulber2_k1om.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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')" />
Expand Down Expand Up @@ -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'))" />
Expand Down
4 changes: 2 additions & 2 deletions mandelbulber2/msvc/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down

0 comments on commit 372316f

Please sign in to comment.