diff options
author | Justin Berger <j.david.berger@gmail.com> | 2018-04-02 10:10:33 -0600 |
---|---|---|
committer | Justin Berger <j.david.berger@gmail.com> | 2018-04-02 10:10:33 -0600 |
commit | 75460f240c9d003e4ca2e6dda9b2146a74df7ffa (patch) | |
tree | 957b26f0539df176b61ad2ec72fbb0658b147919 /winbuild/calibrate/calibrate.vcxproj | |
parent | 2b63278497130d01b1fbc7e6a94b6ad8e32ab4dd (diff) | |
parent | 1724abef15a4090640bd82ba408681438316de7e (diff) | |
download | libsurvive-75460f240c9d003e4ca2e6dda9b2146a74df7ffa.tar.gz libsurvive-75460f240c9d003e4ca2e6dda9b2146a74df7ffa.tar.bz2 |
Merge remote-tracking branch 'origin/master' into imu
Diffstat (limited to 'winbuild/calibrate/calibrate.vcxproj')
-rw-r--r-- | winbuild/calibrate/calibrate.vcxproj | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/winbuild/calibrate/calibrate.vcxproj b/winbuild/calibrate/calibrate.vcxproj index 7a62c14..d0b1c48 100644 --- a/winbuild/calibrate/calibrate.vcxproj +++ b/winbuild/calibrate/calibrate.vcxproj @@ -75,6 +75,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <LinkIncremental>true</LinkIncremental> + <LibraryPath>$(LibraryPath)</LibraryPath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> @@ -111,6 +112,7 @@ <Optimization>Disabled</Optimization> <PreprocessorDefinitions>USE_DOUBLE;RUNTIME_SYMNUMX;HIDAPI;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\windows;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <ShowIncludes>true</ShowIncludes> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -176,16 +178,30 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\..\calibrate.c" /> + <ClCompile Include="..\..\redist\CNFG3D.c" /> + <ClCompile Include="..\..\redist\CNFGFunctions.c" /> + <ClCompile Include="..\..\redist\CNFGWinDriver.c" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\windows\hidapi.h" /> + <ClInclude Include="..\..\redist\CNFG3D.h" /> + <ClInclude Include="..\..\redist\CNFGFunctions.h" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\libsurvive\libsurvive.vcxproj"> <Project>{435cfd2c-8724-42ee-8fde-71ef7d2c6b2f}</Project> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\packages\OpenBLAS.0.2.14.1\build\native\openblas.targets" Condition="Exists('..\packages\OpenBLAS.0.2.14.1\build\native\openblas.targets')" /> </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('..\packages\OpenBLAS.0.2.14.1\build\native\openblas.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenBLAS.0.2.14.1\build\native\openblas.targets'))" /> + </Target> </Project>
\ No newline at end of file |