2
0
bfiete 5 жил өмнө
parent
commit
af77115f18

+ 1 - 4
BeefRT/CMakeLists.txt

@@ -194,10 +194,7 @@ if(MSVC)
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W3 /GL /Od /Oi /Gy /EHsc")
 endif(MSVC)
 if(NOT MSVC)
-  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()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -Wno-multichar -Wno-invalid-offsetof")    
 endif(NOT MSVC)
 
 ################ Files ################

+ 0 - 3
BeefySysLib/CMakeLists.txt

@@ -104,9 +104,6 @@ if(MSVC)
 endif(MSVC)
 if(NOT MSVC)
   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)
 
 ################ Files ################

+ 13 - 12
CMakeLists.txt

@@ -1,12 +1,13 @@
-cmake_minimum_required(VERSION 3.5)

-

-if(NOT CMAKE_BUILD_TYPE)

-  set(CMAKE_BUILD_TYPE "Debug")

-  message(STATUS "Build type not specified: Use Debug by default.")

-endif(NOT CMAKE_BUILD_TYPE)

-

-add_subdirectory(extern/hunspell)

-add_subdirectory(BeefySysLib)

-add_subdirectory(IDEHelper)

-add_subdirectory(BeefBoot)

-add_subdirectory(BeefRT)

+cmake_minimum_required(VERSION 3.5)
+project("Beef")
+
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Debug")
+  message(STATUS "Build type not specified: Use Debug by default.")
+endif(NOT CMAKE_BUILD_TYPE)
+
+add_subdirectory(extern/hunspell)
+add_subdirectory(BeefySysLib)
+add_subdirectory(IDEHelper)
+add_subdirectory(BeefBoot)
+add_subdirectory(BeefRT)

+ 3 - 0
IDE/src/BuildContext.bf

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

+ 4 - 14
IDEHelper/CMakeLists.txt

@@ -122,10 +122,7 @@ if(MSVC)
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W3 /GL /Od /Oi /Gy /EHsc")
 endif(MSVC)
 if(NOT MSVC)
-  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()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -Wno-multichar -Wno-invalid-offsetof")    
 endif(NOT MSVC)
 
 ################ Files ################
@@ -194,17 +191,10 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-set(TARGET_LIBS_OS "")
-if (HAVE_BACKTRACE_HEADERS)
-  set(TARGET_LIBS_OS "-lbacktrace")
-endif()
-
-set(TARGET_LIBS_OS "${TARGET_LIBS_OS} ${LLVM_SYSTEM_LIBS}")    
+set(TARGET_LIBS_OS "${LLVM_SYSTEM_LIBS}")
 
-if (${APPLE})
-    set(TARGET_LIBS_OS "${TARGET_LIBS_OS} ncurses")
-else()
-    
+if (HAVE_BACKTRACE_HEADERS)
+  set(TARGET_LIBS_OS " -lbacktrace")
 endif()
 
 list(APPEND LLVM_LIBS

+ 2 - 7
bin/build.sh

@@ -44,10 +44,9 @@ cd ../IDE/dist
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	LIBEXT=dylib
-	LINKOPTS="-Wl,-rpath -Wl,@executable_path"	
+	LINKOPTS="-Wl,-no_compact_unwind -Wl,-rpath -Wl,@executable_path"	
 else
-	LIBEXT=so
-	#LINKOPTS="-ldl -lpthread -ltinfo -Wl,-rpath -Wl,\$ORIGIN"
+	LIBEXT=so	
 	LINKOPTS="-ldl -lpthread -Wl,-rpath -Wl,\$ORIGIN"
 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"
 echo Building BeefBuild_d
 ./BeefBuild_bootd -clean -proddir=../../BeefBuild -config=Debug
-#./BeefBuild_d -proddir=../../TestApp
-#../../TestApp/build/Debug_Linux64/TestApp/TestApp
 echo Testing IDEHelper/Tests in BeefBuild_d
 ./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"
 echo Building BeefBuild
 ./BeefBuild_boot -clean -proddir=../../BeefBuild -config=Release
-#./BeefBuild_d -proddir=../../TestApp
-#../../TestApp/build/Debug_Linux64/TestApp/TestApp
 echo Testing IDEHelper/Tests in BeefBuild
 ./BeefBuild -proddir=../../IDEHelper/Tests -test