Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 03:28:20 +02:00
Code Activity

Initial macOS changes

Browse source 
Many changes are related to fixing warnings
This commit is contained in:
Brian Fiete 2019-10-14 14:08:29 -07:00
parent 75f11b1459
commit 22ec4a86b8
52 changed files with 2873 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BeefBoot/BootApp.cpp
View file

@ -199,6 +199,7 @@ void BootApp::OutputLine(const String& text, OutputPri outputPri)
if (mVerbosity < Verbosity_Minimal)
return;
break;
default: break;
}
if (outputPri == OutputPri_Warning)

46
BeefBoot/CMakeLists.txt
View file

@ -32,17 +32,33 @@ add_definitions(
-DBFSYSLIB_DYNAMIC
)
include_directories(
.
../BeefySysLib/
../BeefySysLib/platform/linux
../BeefySysLib/third_party
../BeefySysLib/third_party/freetype/include
../
../extern/llvm-project_8_0_0/llvm/include
../extern/llvm-project_8_0_0/llvm/lib/Target
../IDEHelper
)
if (${APPLE})
include_directories(
.
../
../BeefySysLib/
../BeefySysLib/third_party
../BeefySysLib/third_party/freetype/include
../extern/llvm-project_8_0_0/llvm/include
../extern/llvm-project_8_0_0/llvm/lib/Target
../IDEHelper
../BeefySysLib/platform/osx
)
else()
include_directories(
.
../
../BeefySysLib/
../BeefySysLib/third_party
../BeefySysLib/third_party/freetype/include
../extern/llvm-project_8_0_0/llvm/include
../extern/llvm-project_8_0_0/llvm/lib/Target
../IDEHelper
../BeefySysLib/platform/linux
)
endif()
############## Artefacts Output #################
# Defines outputs , depending Debug or Release. #
@ -112,11 +128,17 @@ add_executable(${PROJECT_NAME}
${SRC_FILES}
)
if (${APPLE})
set(TARGET_LIBS_OS "")
else()
set(TARGET_LIBS_OS "tinfo")
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 tinfo
target_link_libraries(${PROJECT_NAME} BeefySysLib IDEHelper ${TARGET_LIBS_OS}
#${LLVM_LIB}/libLLVMMC.a
)
endif()