From fc4c6bca9191cd3816f1c8f9b601b977abe1ddb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= Date: Mon, 1 Jan 2024 04:58:17 +0100 Subject: [PATCH] Update source-linux.md --- documentation/source-linux.md | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/documentation/source-linux.md b/documentation/source-linux.md index 12f42b4..58be4ff 100644 --- a/documentation/source-linux.md +++ b/documentation/source-linux.md @@ -7,16 +7,16 @@ layout: default Generic build instructions for Friction on Linux. +*Instructions are for the `main` git branch.* + ## Requirements * pkg-config -* python3 *(needed to configure skia build)* * ninja * cmake *(3.9+)* * clang *(7+)* * Qt5 *(5.12.12 or 5.15.3+)* * Gui - * Concurrent * Widgets * OpenGL * Multimedia @@ -49,7 +49,6 @@ build-essential \ clang \ git \ cmake \ -python3 \ ninja-build \ libfontconfig1-dev \ libfreetype-dev \ @@ -79,22 +78,13 @@ libicu-dev \ libharfbuzz-dev ``` -## Get the source +## Source ``` git clone --recurse-submodules https://github.com/friction2d/friction ``` -## Build skia - -``` -cd friction/src/skia -python3 fetch-gn -bin/gn gen out/build --args='is_official_build=true is_debug=false cc="clang" cxx="clang++" extra_cflags=["-Wno-error"] target_os="linux" target_cpu="x64" skia_use_system_expat=true skia_use_system_freetype2=true skia_use_system_libjpeg_turbo=true skia_use_system_libpng=true skia_use_system_libwebp=true skia_use_system_zlib=true skia_use_system_icu=true skia_use_system_harfbuzz=true skia_use_dng_sdk=false' -ninja -C out/build -j4 skia -``` - -## Build Friction +## Build ``` cd friction @@ -110,7 +100,6 @@ cmake -G Ninja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_CXX_COMPILER=clang++ \ -DCMAKE_C_COMPILER=clang \ --DUSE_SKIA_SYSTEM_LIBS=ON \ -DQSCINTILLA_INCLUDE_DIRS= \ -DQSCINTILLA_LIBRARIES_DIRS= \ -DQSCINTILLA_LIBRARIES= \ @@ -124,8 +113,7 @@ cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_CXX_COMPILER=clang++ \ --DCMAKE_C_COMPILER=clang \ --DUSE_SKIA_SYSTEM_LIBS=ON \ +-DCMAKE_C_COMPILER=clang .. ``` @@ -134,3 +122,9 @@ Now build: ``` cmake --build . ``` + +Package with: + +``` +cpack -G DEB (or RPM) +```