From 743e4b60f03db3c8c340b63b8d27eac579e146dd Mon Sep 17 00:00:00 2001
From: CNLohr <lohr85@gmail.com>
Date: Fri, 17 Mar 2017 03:10:55 -0400
Subject: Update Windows build to reflect changes in RawDraw.

---
 calibrate.c                                    |  4 ++++
 calibrate_client.c                             |  3 +++
 data_recorder.c                                |  4 ++++
 winbuild/build_tcc.bat                         |  2 +-
 winbuild/libsurvive/libsurvive.vcxproj         |  6 +++---
 winbuild/libsurvive/libsurvive.vcxproj.filters | 18 +++++++++---------
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/calibrate.c b/calibrate.c
index 3d83baf..726a8cc 100644
--- a/calibrate.c
+++ b/calibrate.c
@@ -40,6 +40,10 @@ void HandleMotion( int x, int y, int mask )
 {
 }
 
+void HandleDestroy()
+{
+}
+
 //int bufferpts[32*2*3][2];
 int bufferpts[32*2*3][2];
 
diff --git a/calibrate_client.c b/calibrate_client.c
index 5e31cfb..1a2ee41 100644
--- a/calibrate_client.c
+++ b/calibrate_client.c
@@ -35,6 +35,9 @@ void HandleButton( int x, int y, int button, int bDown )
 void HandleMotion( int x, int y, int mask )
 {
 }
+void HandleDestroy()
+{
+}
 
 int bufferpts[32*2*3];
 char buffermts[32*128*3];
diff --git a/data_recorder.c b/data_recorder.c
index 630598a..afc17b2 100644
--- a/data_recorder.c
+++ b/data_recorder.c
@@ -33,6 +33,10 @@ void HandleMotion( int x, int y, int mask )
 {
 }
 
+void HandleDestroy()
+{
+}
+
 int bufferpts[32*2*3];
 char buffermts[32*128*3];
 int buffertimeto[32*3];
diff --git a/winbuild/build_tcc.bat b/winbuild/build_tcc.bat
index 46f4beb..5be1361 100644
--- a/winbuild/build_tcc.bat
+++ b/winbuild/build_tcc.bat
@@ -7,7 +7,7 @@ set SR=..\src\
 set RD=..\redist\
 set SOURCES=%SR%ootx_decoder.c %SR%poser_charlesslow.c %SR%poser_daveortho.c %SR%poser_dummy.c %SR%survive.c %SR%survive_cal.c %SR%survive_config.c %SR%survive_data.c %SR%survive_driverman.c %SR%survive_process.c %SR%survive_vive.c
 set REDIST=%RD%crc32.c %RD%linmath.c %RD%puff.c %RD%jsmn.c %RD%json_helpers.c  %RD%symbol_enumerator.c
-set EXEC=..\calibrate.c %RD%WinDriver.c %RD%os_generic.c %RD%DrawFunctions.c
+set EXEC=..\calibrate.c %RD%CNFGWinDriver.c %RD%os_generic.c %RD%CNFGFunctions.c
 set CFLAGS=-DNOZLIB -DTCC -DWINDOWS -DHIDAPI -DWIN32 -DRUNTIME_SYMNUM -O0 -g -rdynamic -I..\redist -I..\include\libsurvive -I..\src -I.
 set LDFLAGS=-lkernel32 -lgdi32 -luser32 -lsetupapi -ldbghelp
 @echo on
diff --git a/winbuild/libsurvive/libsurvive.vcxproj b/winbuild/libsurvive/libsurvive.vcxproj
index 996f342..643cff5 100644
--- a/winbuild/libsurvive/libsurvive.vcxproj
+++ b/winbuild/libsurvive/libsurvive.vcxproj
@@ -139,8 +139,9 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\redist\CNFGFunctions.c" />
+    <ClCompile Include="..\..\redist\CNFGWinDriver.c" />
     <ClCompile Include="..\..\redist\crc32.c" />
-    <ClCompile Include="..\..\redist\DrawFunctions.c" />
     <ClCompile Include="..\..\redist\hid-windows.c" />
     <ClCompile Include="..\..\redist\jsmn.c" />
     <ClCompile Include="..\..\redist\json_helpers.c" />
@@ -148,7 +149,6 @@
     <ClCompile Include="..\..\redist\os_generic.c" />
     <ClCompile Include="..\..\redist\puff.c" />
     <ClCompile Include="..\..\redist\symbol_enumerator.c" />
-    <ClCompile Include="..\..\redist\WinDriver.c" />
     <ClCompile Include="..\..\src\ootx_decoder.c" />
     <ClCompile Include="..\..\src\poser_charlesslow.c" />
     <ClCompile Include="..\..\src\poser_daveortho.c" />
@@ -166,8 +166,8 @@
     <ClInclude Include="..\..\include\libsurvive\poser.h" />
     <ClInclude Include="..\..\include\libsurvive\survive.h" />
     <ClInclude Include="..\..\include\libsurvive\survive_types.h" />
+    <ClInclude Include="..\..\redist\CNFGFunctions.h" />
     <ClInclude Include="..\..\redist\crc32.h" />
-    <ClInclude Include="..\..\redist\DrawFunctions.h" />
     <ClInclude Include="..\..\redist\jsmn.h" />
     <ClInclude Include="..\..\redist\json_helpers.h" />
     <ClInclude Include="..\..\redist\linmath.h" />
diff --git a/winbuild/libsurvive/libsurvive.vcxproj.filters b/winbuild/libsurvive/libsurvive.vcxproj.filters
index 8be02f1..0bb9d1b 100644
--- a/winbuild/libsurvive/libsurvive.vcxproj.filters
+++ b/winbuild/libsurvive/libsurvive.vcxproj.filters
@@ -60,12 +60,6 @@
     <ClCompile Include="..\..\redist\puff.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\redist\DrawFunctions.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\redist\WinDriver.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\redist\json_helpers.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -84,6 +78,12 @@
     <ClCompile Include="..\..\redist\hid-windows.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="..\..\src\ootx_decoder.h">
@@ -110,9 +110,6 @@
     <ClInclude Include="..\..\redist\os_generic.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\redist\DrawFunctions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\redist\json_helpers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -131,5 +128,8 @@
     <ClInclude Include="..\hidapi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\redist\CNFGFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3