Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-15 06:44:10 +02:00
Code Activity

macOS fixes

Browse source
This commit is contained in:
bfiete 2020-05-21 13:30:30 -07:00
parent 672be8a8f7
commit af77115f18
6 changed files with 23 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BeefRT/CMakeLists.txt
View file

@ -195,9 +195,6 @@ if(MSVC)
endif(MSVC) endif(MSVC)
if(NOT MSVC) if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -Wno-multichar -Wno-invalid-offsetof") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -Wno-multichar -Wno-invalid-offsetof")
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
endif(NOT MSVC) endif(NOT MSVC)
################ Files ################ ################ Files ################

3
BeefySysLib/CMakeLists.txt
View file

@ -104,9 +104,6 @@ if(MSVC)
endif(MSVC) endif(MSVC)
if(NOT MSVC) if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-multichar") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-multichar")
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
endif(NOT MSVC) endif(NOT MSVC)
################ Files ################ ################ Files ################

1
CMakeLists.txt
View file

@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
project("Beef")
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Debug") set(CMAKE_BUILD_TYPE "Debug")

3
IDE/src/BuildContext.bf
View file

@ -312,6 +312,9 @@ namespace IDE
if (mPlatformType == .Linux) if (mPlatformType == .Linux)
linkLine.Append("-no-pie "); linkLine.Append("-no-pie ");
if (mPlatformType == .macOS)
linkLine.Append("-Wl,-no_compact_unwind ");
linkLine.Append(objectsArg); linkLine.Append(objectsArg);
//var destDir = scope String(); //var destDir = scope String();

16
IDEHelper/CMakeLists.txt
View file

@ -123,9 +123,6 @@ if(MSVC)
endif(MSVC) endif(MSVC)
if(NOT MSVC) if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -Wno-multichar -Wno-invalid-offsetof") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -Wno-multichar -Wno-invalid-offsetof")
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
endif(NOT MSVC) endif(NOT MSVC)
################ Files ################ ################ Files ################
@ -194,17 +191,10 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
set(TARGET_LIBS_OS "") set(TARGET_LIBS_OS "${LLVM_SYSTEM_LIBS}")
if (HAVE_BACKTRACE_HEADERS) if (HAVE_BACKTRACE_HEADERS)
set(TARGET_LIBS_OS "-lbacktrace") set(TARGET_LIBS_OS " -lbacktrace")
endif()
set(TARGET_LIBS_OS "${TARGET_LIBS_OS} ${LLVM_SYSTEM_LIBS}")
if (${APPLE})
set(TARGET_LIBS_OS "${TARGET_LIBS_OS} ncurses")
else()
endif() endif()
list(APPEND LLVM_LIBS list(APPEND LLVM_LIBS

7
bin/build.sh
View file

@ -44,10 +44,9 @@ cd ../IDE/dist
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
LIBEXT=dylib LIBEXT=dylib
LINKOPTS="-Wl,-rpath -Wl,@executable_path" LINKOPTS="-Wl,-no_compact_unwind -Wl,-rpath -Wl,@executable_path"
else else
LIBEXT=so LIBEXT=so
#LINKOPTS="-ldl -lpthread -ltinfo -Wl,-rpath -Wl,\$ORIGIN"
LINKOPTS="-ldl -lpthread -Wl,-rpath -Wl,\$ORIGIN" LINKOPTS="-ldl -lpthread -Wl,-rpath -Wl,\$ORIGIN"
fi fi
@ -67,8 +66,6 @@ echo Building BeefBuild_bootd
../../jbuild_d/Debug/bin/BeefBoot --out="BeefBuild_bootd" --src=../src --src=../../BeefBuild/src --src=../../BeefLibs/corlib/src --src=../../BeefLibs/Beefy2D/src --define=CLI --define=DEBUG --startup=BeefBuild.Program --linkparams="./libBeefRT_d.a ./libIDEHelper_d.$LIBEXT ./libBeefySysLib_d.$LIBEXT $(< ../../IDE/dist/IDEHelper_libs_d.txt) $LINKOPTS" ../../jbuild_d/Debug/bin/BeefBoot --out="BeefBuild_bootd" --src=../src --src=../../BeefBuild/src --src=../../BeefLibs/corlib/src --src=../../BeefLibs/Beefy2D/src --define=CLI --define=DEBUG --startup=BeefBuild.Program --linkparams="./libBeefRT_d.a ./libIDEHelper_d.$LIBEXT ./libBeefySysLib_d.$LIBEXT $(< ../../IDE/dist/IDEHelper_libs_d.txt) $LINKOPTS"
echo Building BeefBuild_d echo Building BeefBuild_d
./BeefBuild_bootd -clean -proddir=../../BeefBuild -config=Debug ./BeefBuild_bootd -clean -proddir=../../BeefBuild -config=Debug
#./BeefBuild_d -proddir=../../TestApp
#../../TestApp/build/Debug_Linux64/TestApp/TestApp
echo Testing IDEHelper/Tests in BeefBuild_d echo Testing IDEHelper/Tests in BeefBuild_d
./BeefBuild_d -proddir=../../IDEHelper/Tests -test ./BeefBuild_d -proddir=../../IDEHelper/Tests -test
@ -78,7 +75,5 @@ echo Building BeefBuild_boot
../../jbuild/Release/bin/BeefBoot --out="BeefBuild_boot" --src=../src --src=../../BeefBuild/src --src=../../BeefLibs/corlib/src --src=../../BeefLibs/Beefy2D/src --define=CLI --startup=BeefBuild.Program --linkparams="./libBeefRT.a ./libIDEHelper.$LIBEXT ./libBeefySysLib.$LIBEXT $(< ../../IDE/dist/IDEHelper_libs.txt) $LINKOPTS" ../../jbuild/Release/bin/BeefBoot --out="BeefBuild_boot" --src=../src --src=../../BeefBuild/src --src=../../BeefLibs/corlib/src --src=../../BeefLibs/Beefy2D/src --define=CLI --startup=BeefBuild.Program --linkparams="./libBeefRT.a ./libIDEHelper.$LIBEXT ./libBeefySysLib.$LIBEXT $(< ../../IDE/dist/IDEHelper_libs.txt) $LINKOPTS"
echo Building BeefBuild echo Building BeefBuild
./BeefBuild_boot -clean -proddir=../../BeefBuild -config=Release ./BeefBuild_boot -clean -proddir=../../BeefBuild -config=Release
#./BeefBuild_d -proddir=../../TestApp
#../../TestApp/build/Debug_Linux64/TestApp/TestApp
echo Testing IDEHelper/Tests in BeefBuild echo Testing IDEHelper/Tests in BeefBuild
./BeefBuild -proddir=../../IDEHelper/Tests -test ./BeefBuild -proddir=../../IDEHelper/Tests -test