Win build vcpkg

.gitignore

@@ -1,5 +1,9 @@
 # IDE Generated files
 *.suo
+.vs/
+CMakeSettings.json
+.idea
+cmake-build-debug/
 
 # Compiled Object files
 *.slo
@@ -56,3 +60,5 @@ SetBuildVars_X64.bat
 !src/openvr_plugin/resources/*.obj
 
 *.kdev4
+
+.DS_Store

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "thirdparty/libusb"]
-	path = thirdparty/libusb
-	url = https://github.com/libusb/libusb.git
 [submodule "thirdparty/hidapi"]
 	path = thirdparty/hidapi
 	url = https://github.com/signal11/hidapi.git
@@ -18,24 +15,15 @@
 [submodule "thirdparty/protobuf"]
 	path = thirdparty/protobuf
 	url = https://github.com/google/protobuf.git
-[submodule "thirdparty/imgui"]
-	path = thirdparty/imgui
-	url = https://github.com/ocornut/imgui.git
 [submodule "thirdparty/stb"]
 	path = thirdparty/stb
 	url = https://github.com/nothings/stb.git
-[submodule "thirdparty/SDL2"]
-	path = thirdparty/SDL2
-	url = https://github.com/spurious/SDL-mirror.git
-[submodule "thirdparty/eigen"]
-	path = thirdparty/eigen
-	url = https://github.com/libigl/eigen.git
 [submodule "thirdparty/kalman"]
 	path = thirdparty/kalman
 	url = https://github.com/mherb/kalman.git
 [submodule "thirdparty/libstem_gamepad"]
 	path = thirdparty/libstem_gamepad
-	url = https://github.com/cboulay/libstem_gamepad.git
+	url = https://github.com/psmoveservice/libstem_gamepad.git
 [submodule "thirdparty/lockfreequeue"]
 	path = thirdparty/lockfreequeue
 	url = https://github.com/cameron314/readerwriterqueue.git

cmake/Environment.cmake

@@ -43,21 +43,21 @@ endif()
 #links against static runtime, so we need our apps to link
 #against the static runtime too.
 #https://cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
-IF(MSVC)
-    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+#IF(MSVC)
+#    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+#    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
 
-    set(CompilerFlags
-        CMAKE_CXX_FLAGS
-        CMAKE_CXX_FLAGS_DEBUG
-        CMAKE_CXX_FLAGS_RELEASE
-        CMAKE_C_FLAGS
-        CMAKE_C_FLAGS_DEBUG
-        CMAKE_C_FLAGS_RELEASE
-        )
-    foreach(CompilerFlag ${CompilerFlags})
-      string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
-    endforeach()
-ELSE()
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch")
-ENDIF(MSVC)
+#    set(CompilerFlags
+#        CMAKE_CXX_FLAGS
+#        CMAKE_CXX_FLAGS_DEBUG
+#        CMAKE_CXX_FLAGS_RELEASE
+#        CMAKE_C_FLAGS
+#        CMAKE_C_FLAGS_DEBUG
+#        CMAKE_C_FLAGS_RELEASE
+#        )
+#    foreach(CompilerFlag ${CompilerFlags})
+#      string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
+#    endforeach()
+#ELSE()
+#    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch")
+#ENDIF(MSVC)

cmake/FindUSB1.cmake

@@ -21,79 +21,23 @@ IF (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
     set(LIBUSB_FOUND TRUE)
 
 ELSE (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
-    set(LIBUSB_ROOT ${CMAKE_CURRENT_LIST_DIR}/../thirdparty/libusb)
-    # Because we want to use the static library,
-    # look locally only.
+
     find_path(LIBUSB_INCLUDE_DIR
         NAMES
             libusb.h
-        PATHS 
-            ${LIBUSB_ROOT}/libusb
-            ${LIBUSB_ROOT}/libusb-1.0
+        HINTS 
             /usr/local/include
+		PATH_SUFFIXES
+			libusb-1.0
     )
-    # There are 4 platform-specific ways we might get the libraries.
-    # 1 - Windows MSVC, download the source, compile with MSVC
-    # 2 - Windows MSVC, download pre-compiled binaries <- Do not use; wrong CRT library
-    # 3 - Windows MinGW, download pre-compiled binaries
-    # 4 - OSX, download the source, build, but do not install
-    # 5 - OSX, homebrew OR download the source, build, and install
-    # Each of these puts the compiled library into a different folder
-    # and that is also architecture-specific.
-
-    set(LIBUSB_LIB_SEARCH_PATH_RELEASE ${LIBUSB_ROOT})
-    set(LIBUSB_LIB_SEARCH_PATH_DEBUG ${LIBUSB_ROOT})
-    IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-        IF(MINGW)
-            set(LIBUSB_PLATFORM_PREFIX MinGW)  # Does this get used?
-            #TODO: Add self-compiled folder for MinGW
-            IF (${CMAKE_C_SIZEOF_DATA_PTR} EQUAL 8)
-                list(APPEND LIBUSB_LIB_SEARCH_PATH_RELEASE
-                    ${LIBUSB_ROOT}/MinGW64/static)
-                list(APPEND LIBUSB_LIB_SEARCH_PATH_DEBUG
-                    ${LIBUSB_ROOT}/MinGW64/static)
-            ELSE()
-                list(APPEND LIBUSB_LIB_SEARCH_PATH_RELEASE
-                    ${LIBUSB_ROOT}/MinGW32/static)
-                list(APPEND LIBUSB_LIB_SEARCH_PATH_DEBUG
-                    ${LIBUSB_ROOT}/MinGW32/static)
-            ENDIF()
-        ELSE() # MSVC?
-            set(LIBUSB_PLATFORM_PREFIX MS)  # Does this get used?
-            IF (${CMAKE_C_SIZEOF_DATA_PTR} EQUAL 8)
-                list(APPEND LIBUSB_LIB_SEARCH_PATH_RELEASE
-                    ${LIBUSB_ROOT}/x64/Release/lib)
-                list(APPEND LIBUSB_LIB_SEARCH_PATH_DEBUG
-                    ${LIBUSB_ROOT}/x64/Debug/lib)
-            ELSE()
-                list(APPEND LIBUSB_LIB_SEARCH_PATH_RELEASE
-                    ${LIBUSB_ROOT}/Win32/Release/lib)
-                list(APPEND LIBUSB_LIB_SEARCH_PATH_DEBUG
-                    ${LIBUSB_ROOT}/Win32/Debug/lib)
-            ENDIF()
-        ENDIF()
-    ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-        list(APPEND LIBUSB_LIB_SEARCH_PATH_RELEASE
-                    ${LIBUSB_ROOT}/libusb/.libs
-                    /usr/local/lib)
-        list(APPEND LIBUSB_LIB_SEARCH_PATH_DEBUG
-                    ${LIBUSB_ROOT}/libusb/.libs
-                    /usr/local/lib)
-    ENDIF()
 
-    FIND_LIBRARY(LIBUSB_LIBRARY_RELEASE
-            NAMES libusb-1.0.a libusb-1.0.lib libusb-1.0 usb-1.0 usb
-            PATHS ${LIBUSB_LIB_SEARCH_PATH_RELEASE})
-    FIND_LIBRARY(LIBUSB_LIBRARY_DEBUG
+    FIND_LIBRARY(LIBUSB_LIBRARIES
             NAMES libusb-1.0.a libusb-1.0.lib libusb-1.0 usb-1.0 usb
-            PATHS ${LIBUSB_LIB_SEARCH_PATH_DEBUG})
-    SET(LIBUSB_LIBRARIES
-        debug ${LIBUSB_LIBRARY_DEBUG}
-        optimized ${LIBUSB_LIBRARY_RELEASE})
+            PATHS /usr/local/lib)
 
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR)
+    include(FindPackageHandleStandardArgs)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR)
 
-  MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
+    MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
 
 ENDIF (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)