Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-07-07 08:45:59 +02:00
Code Activity

Linux fixes, now using a IDEHelper_libs.txt file

Browse source
This commit is contained in:
Brian Fiete 2020-05-21 12:55:58 -07:00
parent f8b27c13a2
commit 672be8a8f7
6 changed files with 123 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

22
BeefRT/CMakeLists.txt
View file

@ -43,15 +43,6 @@ if (HAVE_BACKTRACE_HEADERS)
add_definitions(-DBFP_HAS_BACKTRACE)
endif ()
#find_package(Backtrace)
#if(Backtrace_FOUND)
# include_directories(${Backtrace_INCLUDE_DIRS})
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Backtrace_LIBRARIES}")
# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Backtrace_LIBRARIES}")
# add_definitions(-DBFP_HAS_BACKTRACE)
# add_definitions(-DBFP_BACKTRACE_PATH="${Backtrace_HEADER}")
#endif(Backtrace_FOUND)
if (${IOS})
include_directories(
.
@ -285,15 +276,18 @@ add_library(${PROJECT_NAME} STATIC
${SRC_FILES_OS}
)
set(TARGET_LIBS_OS "")
if (HAVE_BACKTRACE_HEADERS)
set(TARGET_LIBS_OS "backtrace")
endif()
if (${APPLE})
target_link_libraries(${PROJECT_NAME} pthread ffi)
elseif (${ANDROID})
set(TARGET_LIBS_OS "")
elseif (${ANDROID})
#target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/../BeefySysLib/third_party/libffi/aarch64-unknown-linux-gnu/.libs/libffi.a)
#target_link_libraries(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/../BeefySysLib/third_party/libffi/i686-pc-linux-gnu/.libs/libffi.a)
else()
#target_link_libraries(${PROJECT_NAME} pthread ffi backtrace)
target_link_libraries(${PROJECT_NAME} pthread ffi)
else()
target_link_libraries(${PROJECT_NAME} pthread ffi ${TARGET_LIBS_OS})
endif()
# Link with other dependencies.