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

Working on Linux fixes

Browse source
This commit is contained in:
bfiete 2020-05-21 06:58:26 -07:00
parent cce45dbc15
commit 6b46904510
18 changed files with 135 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BeefBoot/BootApp.cpp
View file

@ -733,7 +733,11 @@ void BootApp::DoLinkMS()
void BootApp::DoLinkGNU()
{
String linkerPath = "/usr/bin/c++";
String linkerPath;
if (FileExists("/usr/bin/clang++"))
linkerPath = "/usr/bin/clang++";
else
linkerPath = "/usr/bin/c++";
String linkLine;

17
BeefBoot/CMakeLists.txt
View file

@ -15,6 +15,11 @@ set(OUTPUT_RELEASE Release/bin)
project(${PROJECT_NAME} CXX C)
set (CMAKE_CXX_STANDARD 11)
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
#set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# Define Release by default.
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Debug")
@ -110,7 +115,7 @@ endif(MSVC)
if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-multichar -Wno-invalid-offsetof")
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
endif(NOT MSVC)
@ -131,14 +136,18 @@ add_executable(${PROJECT_NAME}
if (${APPLE})
set(TARGET_LIBS_OS "")
else()
set(TARGET_LIBS_OS "tinfo")
#set(TARGET_LIBS_OS "tinfo")
set(TARGET_LIBS_OS "-Xlinker --no-demangle -v")
endif()
# Link with other dependencies.
if(MSVC)
target_link_libraries(${PROJECT_NAME} BeefySysLib IDEHelper kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib)
else()
target_link_libraries(${PROJECT_NAME} BeefySysLib IDEHelper ${TARGET_LIBS_OS}
#${LLVM_LIB}/libLLVMMC.a
target_link_libraries(${PROJECT_NAME} BeefySysLib
IDEHelper
${TARGET_LIBS_OS}
#${LLVM_LIB}/libLLVMSupport.a
)
endif()