verified something and made it possible to run on a OSX machine (videos input only)
This commit is contained in:
@@ -26,6 +26,8 @@ FIND_PACKAGE(Eigen3 REQUIRED)
|
||||
FIND_PACKAGE(OpenCV 3 REQUIRED)
|
||||
FIND_PACKAGE(Threads)
|
||||
|
||||
LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/others)
|
||||
|
||||
INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
|
||||
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/energy/include)
|
||||
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/armor/include)
|
||||
@@ -42,6 +44,9 @@ IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
|
||||
MESSAGE(STATUS "current platform: Windows")
|
||||
TARGET_LINK_LIBRARIES(${BIN_NAME} "${PROJECT_SOURCE_DIR}/others/MVCAMSDK_X64.lib")
|
||||
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||
MESSAGE(STATUS "current platform: Mac")
|
||||
TARGET_LINK_LIBRARIES(${BIN_NAME} "${PROJECT_SOURCE_DIR}/others/libmvsdk.dylib")
|
||||
ELSE ()
|
||||
MESSAGE(STATUS "Unsupport platform: ${CMAKE_SYSTEM_NAME}")
|
||||
ENDIF()
|
||||
|
||||
6
main.cpp
6
main.cpp
@@ -26,7 +26,7 @@ using namespace std;
|
||||
mcu_data mcuData = {
|
||||
0,
|
||||
0,
|
||||
ARMOR_STATE,
|
||||
BIG_ENERGY_STATE,
|
||||
0,
|
||||
1,
|
||||
ENEMY_RED,
|
||||
@@ -56,8 +56,8 @@ int main(int argc, char *argv[]) {
|
||||
video_gimble = new CameraWrapper(0, "armor");
|
||||
video_chassis = new CameraWrapper(1, "energy");
|
||||
} else {
|
||||
video_gimble = new VideoWrapper("/home/sun/项目/energy_video/energy_test.avi");
|
||||
video_chassis = new VideoWrapper("/home/sun/项目/energy_video/energy_test.avi");
|
||||
video_gimble = new VideoWrapper("/Users/leo/Desktop/videos/170.avi");
|
||||
video_chassis = new VideoWrapper("/Users/leo/Desktop/videos/170.avi");
|
||||
}
|
||||
if (video_gimble->init()) {
|
||||
LOGM("video_armor source initialization successfully.");
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ private:
|
||||
DWORD dwCommEvents;
|
||||
};
|
||||
|
||||
#elif defined(Linux)
|
||||
#elif defined(Linux) || defined(Darwin)
|
||||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user