verified something and made it possible to run on a OSX machine (videos input only)

2019-07-06 10:42:23 +08:00
parent aedee4b723
commit 370114db37
5 changed files with 11 additions and 6 deletions
--- a/others/include/camera/camera_wrapper.h
+++ b/others/include/camera/camera_wrapper.h
@@ -16,7 +16,7 @@
 #include "camera/wrapper_head.h"
 #ifdef Windows
    #include "camera/CameraApi.h"
-#elif defined(Linux)
+#elif defined(Linux) || defined(Darwin)
    #include "camera/camera_api.h"
 #endif

--- a/others/include/serial/serial.h
+++ b/others/include/serial/serial.h
@@ -29,7 +29,7 @@ private:
 	DWORD dwCommEvents;
 };

-#elif defined(Linux)
+#elif defined(Linux) || defined(Darwin)

 #include <errno.h>
 #include <fcntl.h>
--- a/others/src/serial/serial.cpp
+++ b/others/src/serial/serial.cpp
@@ -174,7 +174,7 @@ bool Serial::ReadData(unsigned char *buffer,  unsigned int length) {
 	return bResult;
 }

-#elif defined(Linux)
+#elif defined(Linux) || defined(Darwin)

 #include <string.h>