aboutsummaryrefslogtreecommitdiff
path: root/winbuild/libsurvive
diff options
context:
space:
mode:
authorJustin Berger <j.david.berger@gmail.com>2018-03-28 21:52:00 -0600
committerJustin Berger <j.david.berger@gmail.com>2018-03-28 22:14:30 -0600
commit08cc0afc797d2225cf23fbc785e6a28cc8667285 (patch)
tree88443149d251316d5ee8946a3b0e393a18146f45 /winbuild/libsurvive
parent91f0cab811e983da63ea49f6e24afae283138a1c (diff)
downloadlibsurvive-08cc0afc797d2225cf23fbc785e6a28cc8667285.tar.gz
libsurvive-08cc0afc797d2225cf23fbc785e6a28cc8667285.tar.bz2
Nuget packaged up dependencies
Diffstat (limited to 'winbuild/libsurvive')
-rw-r--r--winbuild/libsurvive/libsurvive.vcxproj33
-rw-r--r--winbuild/libsurvive/libsurvive.vcxproj.filters37
-rw-r--r--winbuild/libsurvive/packages.config5
3 files changed, 71 insertions, 4 deletions
diff --git a/winbuild/libsurvive/libsurvive.vcxproj b/winbuild/libsurvive/libsurvive.vcxproj
index 6268d63..2451c22 100644
--- a/winbuild/libsurvive/libsurvive.vcxproj
+++ b/winbuild/libsurvive/libsurvive.vcxproj
@@ -56,6 +56,7 @@
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
+ <Import Project="$(SolutionDir)\packages\OpenBLAS.0.2.14.1\build\native\openblas.targets" Condition="Exists('$(SolutionDir)\packages\OpenBLAS.0.2.14.1\build\native\openblas.targets')" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -70,14 +71,17 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <IncludePath>$(IncludePath)</IncludePath>
+ <LibraryPath>$(LibraryPath)</LibraryPath>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>FLT=double;USE_DOUBLE;MANUAL_REGISTRATION;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>FLT=double;USE_DOUBLE;MANUAL_REGISTRATION;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;_DEBUG;_LIB;HAVE_LAPACK_CONFIG_H;LAPACK_COMPLEX_STRUCTURE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
@@ -89,6 +93,10 @@
<ModuleDefinitionFile>$(MSBuildProjectDirectory)\libsurvive.def</ModuleDefinitionFile>
</Link>
<ProjectReference />
+ <Lib>
+ <AdditionalDependencies>libblas.lib;liblapacke.lib;liblapack.lib%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -149,14 +157,23 @@
<ClCompile Include="..\..\redist\jsmn.c" />
<ClCompile Include="..\..\redist\json_helpers.c" />
<ClCompile Include="..\..\redist\linmath.c" />
+ <ClCompile Include="..\..\redist\minimal_opencv.c" />
<ClCompile Include="..\..\redist\puff.c" />
+ <ClCompile Include="..\..\redist\sba\sba_chkjac.c" />
+ <ClCompile Include="..\..\redist\sba\sba_crsm.c" />
+ <ClCompile Include="..\..\redist\sba\sba_lapack.c" />
+ <ClCompile Include="..\..\redist\sba\sba_levmar.c" />
+ <ClCompile Include="..\..\redist\sba\sba_levmar_wrap.c" />
<ClCompile Include="..\..\redist\symbol_enumerator.c" />
+ <ClCompile Include="..\..\src\epnp\epnp.c" />
<ClCompile Include="..\..\src\ootx_decoder.c" />
<ClCompile Include="..\..\src\poser.c" />
<ClCompile Include="..\..\src\poser_charlesslow.c" />
<ClCompile Include="..\..\src\poser_daveortho.c" />
<ClCompile Include="..\..\src\poser_dummy.c" />
+ <ClCompile Include="..\..\src\poser_epnp.c" />
<ClCompile Include="..\..\src\poser_octavioradii.c" />
+ <ClCompile Include="..\..\src\poser_sba.c" />
<ClCompile Include="..\..\src\poser_turveytori.c" />
<ClCompile Include="..\..\src\survive.c" />
<ClCompile Include="..\..\src\survive_cal.c" />
@@ -183,8 +200,11 @@
<ClInclude Include="..\..\redist\jsmn.h" />
<ClInclude Include="..\..\redist\json_helpers.h" />
<ClInclude Include="..\..\redist\linmath.h" />
+ <ClInclude Include="..\..\redist\minimal_opencv.h" />
<ClInclude Include="..\..\redist\os_generic.h" />
+ <ClInclude Include="..\..\redist\sba\sba.h" />
<ClInclude Include="..\..\redist\symbol_enumerator.h" />
+ <ClInclude Include="..\..\src\epnp\epnp.h" />
<ClInclude Include="..\..\src\ootx_decoder.h" />
<ClInclude Include="..\..\src\survive_cal.h" />
<ClInclude Include="..\..\src\survive_config.h" />
@@ -193,8 +213,13 @@
</ItemGroup>
<ItemGroup>
<None Include="libsurvive.def" />
+ <None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+ </PropertyGroup>
+ <Error Condition="!Exists('$(SolutionDir)\packages\OpenBLAS.0.2.14.1\build\native\openblas.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\OpenBLAS.0.2.14.1\build\native\openblas.targets'))" />
+ </Target>
</Project> \ No newline at end of file
diff --git a/winbuild/libsurvive/libsurvive.vcxproj.filters b/winbuild/libsurvive/libsurvive.vcxproj.filters
index 5387108..ffddee9 100644
--- a/winbuild/libsurvive/libsurvive.vcxproj.filters
+++ b/winbuild/libsurvive/libsurvive.vcxproj.filters
@@ -108,6 +108,33 @@
<ClCompile Include="..\..\src\survive_statebased_disambiguator.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\redist\minimal_opencv.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\epnp\epnp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\poser_epnp.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\poser_sba.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\redist\sba\sba_crsm.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\redist\sba\sba_lapack.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\redist\sba\sba_levmar.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\redist\sba\sba_levmar_wrap.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\redist\sba\sba_chkjac.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\ootx_decoder.h">
@@ -152,8 +179,18 @@
<ClInclude Include="..\..\src\survive_default_devices.h">
<Filter>Source Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\redist\minimal_opencv.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\epnp\epnp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\redist\sba\sba.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="libsurvive.def" />
+ <None Include="packages.config" />
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/winbuild/libsurvive/packages.config b/winbuild/libsurvive/packages.config
new file mode 100644
index 0000000..c283d9d
--- /dev/null
+++ b/winbuild/libsurvive/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="lapacke" version="0.1.0" targetFramework="native" />
+ <package id="OpenBLAS" version="0.2.14.1" targetFramework="native" />
+</packages> \ No newline at end of file