Merge pull request #2985 from abernste/win7_compilation_fix

Win7 compilation fix
IntelRealSense · Dec 30, 2018 · 1aa6c24 · 1aa6c24
2 parents 94ecaf3 + 74bc5bf
commit 1aa6c24
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,14 +10,22 @@ matrix:
         - cmake --build . --config $LRS_BUILD_CONFIG -- -m:4
         - ls $LRS_BUILD_CONFIG
 
+    - name: "Windows - Win USB(Win7)"
+      os: windows
+      language: cpp
+      script:
+        - cmake .. -G "Visual Studio 14 2015 Win64" -DBUILD_WITH_OPENMP=false -DHWM_OVER_XU=false -DBUILD_WITH_TM2=false -DFORCE_WINUSB_UVC=true
+        - cmake --build . --config $LRS_BUILD_CONFIG -- -m:4
+        - ls $LRS_BUILD_CONFIG
+
     - name: "Windows - C#"
       os: windows
       language: cpp
       script:
         - cmake .. -G "Visual Studio 14 2015 Win64" -DBUILD_EXAMPLES=false -DBUILD_CSHARP_BINDINGS=true -DDOTNET_VERSION_LIBRARY="4.5" -DDOTNET_VERSION_EXAMPLES="4.5"
         - cmake --build . --config $LRS_BUILD_CONFIG -- -m:4
         - ls $LRS_BUILD_CONFIG
-        
+
     - name: "Mac - cpp"
       os: osx
       language: cpp

diff --git a/src/win7/win7-backend.cpp b/src/win7/win7-backend.cpp
@@ -87,7 +87,7 @@ namespace librealsense
                     uint16_t vid, pid, mi; std::string unique_id, device_guid;
                     if (!parse_usb_path(vid, pid, mi, unique_id, device_guid, path)) continue;
 
-                    usb_device_info info{ path, vid, pid, mi, unique_id, usb_undefined };
+                    usb_device_info info{ path, vid, pid, mi, unique_id, "", usb_undefined };
 
                     result.push_back(info);
                 }