Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 04:22: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

69
BeefRT/CMakeLists.txt
View file

@ -35,19 +35,37 @@ add_definitions(
-DBFRTMERGED
)
include_directories(
.
../BeefySysLib/
../BeefySysLib/platform/linux
../BeefySysLib/third_party
../BeefySysLib/third_party/freetype/include
../BeefySysLib/third_party/libffi/x86_64-unknown-linux-gnu/include
../
../extern
../extern/llvm/include
../extern/llvm_linux/include
../extern/llvm/lib/Target
)
if (${APPLE})
include_directories(
.
../BeefySysLib/
../BeefySysLib/third_party
../BeefySysLib/third_party/freetype/include
../BeefySysLib/third_party/libffi/x86_64-apple-darwin12.5.0/include
../
../extern
../extern/llvm/include
../extern/llvm_linux/include
../extern/llvm/lib/Target
../BeefySysLib/platform/osx
)
else()
include_directories(
.
../BeefySysLib/
../BeefySysLib/third_party
../BeefySysLib/third_party/freetype/include
../BeefySysLib/third_party/libffi/x86_64-unknown-linux-gnu/include
../
../extern
../extern/llvm/include
../extern/llvm_linux/include
../extern/llvm/lib/Target
../BeefySysLib/platform/linux
)
endif()
############## Artefacts Output #################
# Defines outputs , depending Debug or Release. #
@ -117,21 +135,38 @@ file(GLOB SRC_FILES
../BeefySysLib/util/BeefPerf.cpp
../BeefySysLib/util/String.cpp
../BeefySysLib/util/UTF8.cpp
../BeefySysLib/third_party/utf8proc/utf8proc.c
../BeefySysLib/platform/linux/BFPlatform.cpp
../BeefySysLib/platform/linux/LinuxCommon.cpp
../BeefySysLib/third_party/utf8proc/utf8proc.c
)
if (${APPLE})
file(GLOB SRC_FILES_OS
../BeefySysLib/platform/darwin/BFPlatform.cpp
../BeefySysLib/platform/darwin/DarwinCommon.cpp
)
else()
file(GLOB SRC_FILES_OS
../BeefySysLib/platform/linux/BFPlatform.cpp
../BeefySysLib/platform/linux/LinuxCommon.cpp
)
endif()
# Add library to build.
add_library(${PROJECT_NAME} SHARED
${SRC_FILES}
${SRC_FILES_OS}
)
if (${APPLE})
set(TARGET_LIBS_OS "")
else()
set(TARGET_LIBS_OS "backtrace")
endif()
# Link with other dependencies.
if(MSVC)
target_link_libraries(${PROJECT_NAME} BeefySysLib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib LLVMX86Disassembler.lib LLVMMCDisassembler.lib LLVMSupport.lib LLVMX86Info.lib LLVMX86Utils.lib LLVMX86AsmPrinter.lib LLVMX86Desc.lib %(AdditionalDependencies) LLVMMC.lib LLVMObject.lib LLVMCore.lib LLVMBitReader.lib LLVMAsmParser.lib LLVMMCParser.lib LLVMCodeGen.lib LLVMTarget.lib LLVMX86CodeGen.lib LLVMScalarOpts.lib LLVMInstCombine.lib LLVMSelectionDAG.lib LLVMProfileData.lib LLVMTransformUtils.lib LLVMAnalysis.lib LLVMX86AsmParser.lib LLVMAsmPrinter.lib LLVMBitWriter.lib LLVMVectorize.lib LLVMipo.lib LLVMInstrumentation.lib LLVMDebugInfoDWARF.lib LLVMDebugInfoPDB.lib LLVMDebugInfoCodeView.lib LLVMGlobalISel.lib LLVMBinaryFormat.lib libcurl_a.lib)
else()
set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux/lib")
target_link_libraries(${PROJECT_NAME} BeefySysLib pthread dl backtrace ffi
target_link_libraries(${PROJECT_NAME} BeefySysLib pthread dl ffi ${TARGET_LIBS_OS}
)
endif()

2
BeefRT/dbg/DbgInternal.cpp
View file

@ -2,7 +2,7 @@
#define HEAPHOOK
#include <stdio.h>
#include <malloc.h>
//#include <malloc.h>
#include <stdlib.h>
#include <string.h>

6
BeefRT/rt/Chars.cpp
View file

@ -80,6 +80,7 @@ bool bf::System::Char32::get__IsLetterOrDigit(char32_t c)
case UTF8PROC_CATEGORY_ND:
case UTF8PROC_CATEGORY_NL:
case UTF8PROC_CATEGORY_NO: return true;
default: break;
}
return false;
}
@ -94,6 +95,7 @@ bool bf::System::Char32::get__IsLetter(char32_t c)
case UTF8PROC_CATEGORY_LT:
case UTF8PROC_CATEGORY_LM:
case UTF8PROC_CATEGORY_LO: return true;
default: break;
}
return false;
}
@ -106,6 +108,7 @@ bool bf::System::Char32::get__IsNumber(char32_t c)
case UTF8PROC_CATEGORY_ND:
case UTF8PROC_CATEGORY_NL:
case UTF8PROC_CATEGORY_NO: return true;
default: break;
}
return false;
}
@ -150,6 +153,7 @@ bool bf::System::Char16::get__IsLetterOrDigit(char16_t c)
case UTF8PROC_CATEGORY_ND:
case UTF8PROC_CATEGORY_NL:
case UTF8PROC_CATEGORY_NO: return true;
default: break;
}
return false;
}
@ -164,6 +168,7 @@ bool bf::System::Char16::get__IsLetter(char16_t c)
case UTF8PROC_CATEGORY_LT:
case UTF8PROC_CATEGORY_LM:
case UTF8PROC_CATEGORY_LO: return true;
default: break;
}
return false;
}
@ -176,6 +181,7 @@ bool bf::System::Char16::get__IsNumber(char16_t c)
case UTF8PROC_CATEGORY_ND:
case UTF8PROC_CATEGORY_NL:
case UTF8PROC_CATEGORY_NO: return true;
default: break;
}
return false;
}

3
BeefRT/rt/Internal.cpp
View file

@ -7,7 +7,7 @@
#include <stdio.h>
//#include <crtdefs.h>
#include <malloc.h>
//#include <malloc.h>
#include <stdlib.h>
#include <string.h>
//#include <intrin.h>
@ -453,6 +453,7 @@ void* Internal::VirtualAlloc(intptr size, bool canExecute, bool canWrite)
return ptr;
#else
BF_FATAL("Not supported");
return NULL;
#endif
}