fixes or windows

jon-dez · May 5, 2020 · 2b7f209 · 2b7f209
1 parent a263c69
commit 2b7f209
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,11 @@ if(UNIX AND NOT APPLE) # Linux
     set(LINUX TRUE)
 endif()
 
+if(WIN32)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:msvcrt.lib")
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDebugDLL$<$<CONFIG:Debug>:Debug>")
+endif()
+
 ###########################
 # We will be using hidapi #
 ###########################
@@ -26,6 +31,12 @@ target_include_directories(hidapi PRIVATE
     hidapi/hidapi
 )
 
+if(WIN32)
+    target_link_libraries(hidapi
+        setupapi
+    )
+endif()
+
 add_compile_options(
     -D__jctool_cpp_API__
 )

diff --git a/hidapi b/hidapi
diff --git a/jctool/IRSensor.hpp b/jctool/IRSensor.hpp
@@ -12,7 +12,7 @@ class IRSensor {
 
     bool capture_in_progress{};
     IRCaptureMode capture_mode{};
-    IRCaptureStatus capture_status{};
+    IRCaptureStatus capture_status;
 
     int res_idx_selected{}; /** The index number of the resolution selected.
     * See ir_sensor.h.

diff --git a/jctool/jctool.cpp b/jctool/jctool.cpp
@@ -9,11 +9,11 @@
 #include <iomanip>
 #include <sstream>
 // #define NOMINMAX
+#include <chrono>
 #ifdef WIN32
 #include <cstdio>
 #include <Windows.h>
 #else
-#include <chrono>
 #include <stdio.h>
 #include <unistd.h>
 inline int Sleep(uint64_t ms){

diff --git a/jctool/jctool_types.h b/jctool/jctool_types.h
@@ -188,15 +188,15 @@ enum IRCaptureMode : u8 {
 };
 
 struct IRCaptureStatus {
-    float fps;
-    int frame_counter;
-    int last_frag_no;
-    float duration;
-    float noise_level;
-    int avg_intensity_percent;
-    int white_pixels_percent;
-    u16 exfilter;
-    u8 exf_int;
+    float fps{};
+    int frame_counter{};
+    int last_frag_no{};
+    float duration{};
+    float noise_level{};
+    int avg_intensity_percent{};
+    int white_pixels_percent{};
+    u16 exfilter{};
+    u8 exf_int{};
     std::stringstream message_stream;
 };
 

diff --git a/jctool/jctool_ui.cpp b/jctool/jctool_ui.cpp
@@ -68,7 +68,7 @@ SOFTWARE.
 
 namespace JCToolkit {
     namespace Assets {
-        ImageResource battery_indicators[] = {
+        static ImageResource battery_indicators[] = {
             {IMAGE_RES_PATH "batt_0" IMAGE_RES_EXT, false},
             {IMAGE_RES_PATH "batt_0_chr" IMAGE_RES_EXT, false},
             {IMAGE_RES_PATH "batt_25" IMAGE_RES_EXT, false},
@@ -80,17 +80,17 @@ namespace JCToolkit {
             {IMAGE_RES_PATH "batt_100" IMAGE_RES_EXT, false},
             {IMAGE_RES_PATH "batt_100_chr" IMAGE_RES_EXT, false}
         };
-        ImageResource left_joycon[] = {
+        static ImageResource left_joycon[] = {
             {IMAGE_RES_PATH "l_joy_body" IMAGE_RES_EXT, false},
             {IMAGE_RES_PATH "l_joy_buttons" IMAGE_RES_EXT, false},
             {IMAGE_RES_PATH "l_joy_lines" IMAGE_RES_EXT, false},
         };
-        ImageResource right_joycon[] = {
+        static ImageResource right_joycon[] = {
             {IMAGE_RES_PATH "r_joy_body" IMAGE_RES_EXT, false},
             {IMAGE_RES_PATH "r_joy_buttons" IMAGE_RES_EXT, false},
             {IMAGE_RES_PATH "r_joy_lines" IMAGE_RES_EXT, false},
         };
-        ImageResource pro_controller[] = {
+        static ImageResource pro_controller[] = {
             {IMAGE_RES_PATH "pro_body" IMAGE_RES_EXT, false},
             {IMAGE_RES_PATH "pro_buttons" IMAGE_RES_EXT, false},
             {IMAGE_RES_PATH "pro_grips_l" IMAGE_RES_EXT, false},
@@ -232,7 +232,7 @@ namespace JCToolkit {
                 ImGui::SetCursorPos(con_start);
                 ImGui::ImageAutoFit(
                     (ImTextureID)con_images[i].getRID(),
-                    {con_images[i].getWidth(), con_images[i].getHeight()},
+                    {(float)con_images[i].getWidth(), (float)con_images[i].getHeight()},
                     {0,0}, {1,1},
                     ImGui::ColorConvertU32ToFloat4(IM_COL32(col.r,col.g,col.b,255))
                 );
@@ -607,7 +607,7 @@ namespace JCToolkit {
 
         void showIRCameraFeed(IRSensor& ir_sensor){
             auto& size = std::get<2>(ir_resolutions[ir_sensor.res_idx_selected]);
-            ImGui::ImageAutoFit((ImTextureID)ir_sensor.getCaptureTexID(), {size.x, size.y});
+            ImGui::ImageAutoFit((ImTextureID)ir_sensor.getCaptureTexID(), {(float)size.x, (float)size.y});
         }
 
         enum class IRFeedControl {

diff --git a/jctool/session/controller_session.cpp b/jctool/session/controller_session.cpp
@@ -192,7 +192,7 @@ ConSess::Status ConSess::checkConnectionStatus(StatusDelay status_delay){
     return this->getStatus(status_delay);
 }
 
-#define CON_JOB(lbda_captures...) [lbda_captures](controller_hid_handle_t handle, u8& timming_byte)
+#define CON_JOB(...) [__VA_ARGS__](controller_hid_handle_t handle, u8& timming_byte)
 
 void ConSess::testSetLedBusy(){
     ConSessManager::add_job(*this->con,

diff --git a/stb b/stb
diff --git a/ui/ImGui/imgui b/ui/ImGui/imgui