diff --git a/CMakeLists.txt b/CMakeLists.txt index 31adc44968cf2dc3178875cdd83e5585d4e51d67..9b5f7a7822e7eae89e0a82ced256b633ba6c2fc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,13 +2,13 @@ # Determine CMake version and build type. # ----------------------------------------------------------------------------- # -# NOTE: cmake_minimum_required() and project() *MUST* be the two fist commands +# NOTE: cmake_minimum_required() and project() *MUST* be the two first commands # used, see https://cmake.org/cmake/help/v3.3/command/project.html -- the # latter in particular handles loading a bunch of shared CMake definitions # and loading the cross-compilation settings from CMAKE_TOOLCHAIN_FILE. # -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.10) project(WebKit) @@ -37,6 +37,7 @@ endif () set(ALL_PORTS AppleWin Efl + FTW GTK JSCOnly Mac @@ -61,8 +62,8 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQU endif () if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") - if (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "6.0.0") - message(FATAL_ERROR "GCC 6.0.0 is required to build WebKitGTK+, use a newer GCC version or clang") + if (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "7.3.0") + message(FATAL_ERROR "GCC 7.3 or newer is required to build WebKit. Use a newer GCC version or Clang.") endif () endif () @@ -93,7 +94,15 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64") elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") set(WTF_CPU_MIPS 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)") - set(WTF_CPU_X86_64 1) + # FORCE_32BIT is set in the build script when --32-bit is passed + # on a Linux/intel 64bit host. This allows us to produce 32bit + # binaries without setting the build up as a crosscompilation, + # which is the only way to modify CMAKE_SYSTEM_PROCESSOR. + if (FORCE_32BIT) + set(WTF_CPU_X86 1) + else () + set(WTF_CPU_X86_64 1) + endif () elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)") set(WTF_CPU_X86 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") @@ -131,6 +140,7 @@ endif () # By default, only the highest-level libraries, WebKitLegacy and WebKit, are # shared, because properly building shared libraries that depend on each other # can be tricky. Override these in Options*.cmake for your port as needed. +set(bmalloc_LIBRARY_TYPE STATIC) set(WTF_LIBRARY_TYPE STATIC) set(JavaScriptCore_LIBRARY_TYPE STATIC) set(PAL_LIBRARY_TYPE STATIC) diff --git a/Documentation/jsc-glib-4.0/html/JSCClass.html b/Documentation/jsc-glib-4.0/html/JSCClass.html index 6e57b1a78c6a10717c58c352c44f4882d3c65c21..034a55c6ea94d96c2c70a48475eee2527eaa3186 100644 --- a/Documentation/jsc-glib-4.0/html/JSCClass.html +++ b/Documentation/jsc-glib-4.0/html/JSCClass.html @@ -3,12 +3,12 @@
“context”
property “context” JSCContext *
The JSCContext in which the class was registered.
-Owner: JSCClass
-Flags: Write / Construct Only
+Flags: Write / Construct Only
“name”
property“name” gchar *
The name of the class.
-Owner: JSCClass
-Flags: Read / Write / Construct Only
+Flags: Read / Write / Construct Only
Default value: NULL
“parent”
property “parent” JSCClass *
The parent class or NULL
in case of final classes.
Owner: JSCClass
-Flags: Read / Write / Construct Only
+Flags: Read / Write / Construct Only