hm/sil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake修改，编译通过

Browse Source
This commit is contained in:
hm
2021-08-20 14:36:20 +08:00
parent cd64c8336f
commit f2474307d3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -1
View File
@@ -141,7 +141,7 @@ set(${PROJECT_NAME}_SRC
add_definitions(-DWITH_CAPI) add_definitions(-DWITH_CAPI)
add_definitions(-DHAL_IMPL) add_definitions(-DHAL_IMPL)
add_definitions(-DCAPI_MDL=${PROJECT_NAME}) add_definitions(-DCAPI_MDL=${PROJECT_NAME})
add_definitions(-DHDR_MDL= ${PROJECT_NAME}.h) add_definitions(-DHDR_MDL=${PROJECT_NAME}.h)
add_definitions(-DMAVLINK_USE_MESSAGE_INFO) add_definitions(-DMAVLINK_USE_MESSAGE_INFO)
if(ANDROID) if(ANDROID)
@@ -167,6 +167,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets Qt5::Network)
include(GNUInstallDirs) include(GNUInstallDirs)
message("CMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}") message("CMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}")
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
install(FILES ${PROJECT_NAME}/work/${PROJECT_NAME}_win64.dll DESTINATION "${CMAKE_INSTALL_BINDIR}") install(FILES ${PROJECT_NAME}/work/${PROJECT_NAME}_win64.dll DESTINATION "${CMAKE_INSTALL_BINDIR}")
mainwindow.h
+2 -1
View File
@@ -3,7 +3,8 @@
extern "C" extern "C"
{ {
#include "srvl_SIL.h" #include "srvl_SIL_capi.h"
typedef void (*srvl_SIL_initialize_ptr)(void); typedef void (*srvl_SIL_initialize_ptr)(void);
typedef void (*srvl_SIL_step_ptr)(void); typedef void (*srvl_SIL_step_ptr)(void);
typedef const rtwCAPI_ModelMappingStaticInfo *(*srvl_SIL_GetCAPIStaticMap_ptr)(void); typedef const rtwCAPI_ModelMappingStaticInfo *(*srvl_SIL_GetCAPIStaticMap_ptr)(void);