From c47826bb1171083377309e356168b46cb3621df7 Mon Sep 17 00:00:00 2001
From: dpeter99 <dpeter99@gmail.com>
Date: Sun, 25 Mar 2018 21:06:27 +0200
Subject: Started the VS project update

---
 winbuild/calibrate/calibrate.vcxproj | 1 +
 1 file changed, 1 insertion(+)

(limited to 'winbuild/calibrate')

diff --git a/winbuild/calibrate/calibrate.vcxproj b/winbuild/calibrate/calibrate.vcxproj
index 7a62c14..4392e49 100644
--- a/winbuild/calibrate/calibrate.vcxproj
+++ b/winbuild/calibrate/calibrate.vcxproj
@@ -111,6 +111,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>
-- 
cgit v1.2.3


From b543e202ab776f41d0e3301e43bf3d3bc40f0c84 Mon Sep 17 00:00:00 2001
From: dpeter99 <dpeter99@gmail.com>
Date: Mon, 26 Mar 2018 20:19:07 +0200
Subject: Some fixes

No more build errors on win
---
 winbuild/calibrate/calibrate.vcxproj         |  6 +++++-
 winbuild/calibrate/calibrate.vcxproj.filters | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'winbuild/calibrate')

diff --git a/winbuild/calibrate/calibrate.vcxproj b/winbuild/calibrate/calibrate.vcxproj
index 4392e49..51519e6 100644
--- a/winbuild/calibrate/calibrate.vcxproj
+++ b/winbuild/calibrate/calibrate.vcxproj
@@ -177,9 +177,13 @@
   </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">
diff --git a/winbuild/calibrate/calibrate.vcxproj.filters b/winbuild/calibrate/calibrate.vcxproj.filters
index 546497e..dae64dc 100644
--- a/winbuild/calibrate/calibrate.vcxproj.filters
+++ b/winbuild/calibrate/calibrate.vcxproj.filters
@@ -18,9 +18,21 @@
     <ClCompile Include="..\..\calibrate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\redist\CNFG3D.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\redist\CNFGFunctions.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\redist\CNFGWinDriver.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\windows\hidapi.h">
+    <ClInclude Include="..\..\redist\CNFG3D.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\redist\CNFGFunctions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-- 
cgit v1.2.3


From 08cc0afc797d2225cf23fbc785e6a28cc8667285 Mon Sep 17 00:00:00 2001
From: Justin Berger <j.david.berger@gmail.com>
Date: Wed, 28 Mar 2018 21:52:00 -0600
Subject: Nuget packaged up dependencies

---
 winbuild/calibrate/calibrate.vcxproj         | 11 +++++++++++
 winbuild/calibrate/calibrate.vcxproj.filters |  3 +++
 2 files changed, 14 insertions(+)

(limited to 'winbuild/calibrate')

diff --git a/winbuild/calibrate/calibrate.vcxproj b/winbuild/calibrate/calibrate.vcxproj
index 51519e6..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>
@@ -190,7 +191,17 @@
       <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
diff --git a/winbuild/calibrate/calibrate.vcxproj.filters b/winbuild/calibrate/calibrate.vcxproj.filters
index dae64dc..1498023 100644
--- a/winbuild/calibrate/calibrate.vcxproj.filters
+++ b/winbuild/calibrate/calibrate.vcxproj.filters
@@ -36,4 +36,7 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3