Permalink
Browse files

Fix build on Windows after changing includes from <libusb-1.0/libusb.…

…h> to <libusb.h>

Also obtain struct timeval from the winsock headers.

Signed-off-by: Drew Fisher <drew.m.fisher@gmail.com>
  • Loading branch information...
1 parent 8219750 commit 713c71574afc42d9a48bb621f34f6f8da730ed9b @zarvox zarvox committed Feb 5, 2012
Showing with 8 additions and 1 deletion.
  1. +1 −1 CMakeLists.txt
  2. +7 −0 include/libfreenect.h
View
@@ -112,7 +112,7 @@ include_directories(${LIBUSB_1_INCLUDE_DIRS})
if(WIN32)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/platform/windows")
- include_directories("${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/libusb10emu")
+ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/platform/windows/libusb10emu/libusb-1.0")
endif()
# Add library project
View
@@ -29,6 +29,13 @@
#include <stdint.h>
+/* We need struct timeval */
+#ifdef _WIN32
+#include <winsock.h>
+#else
+#include <sys/time.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif

0 comments on commit 713c715

Please sign in to comment.