From 12238af58463fc1b47a9721c52b545b73757dd65 Mon Sep 17 00:00:00 2001 From: lixianjing Date: Fri, 4 Sep 2020 22:00:47 +0800 Subject: [PATCH] fix build on ubuntu 20 --- 3rd/SDL/SConscript | 1 + 3rd/fribidi/fribidi-common.h | 1 + README.md | 2 +- README_zh.md | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/3rd/SDL/SConscript b/3rd/SDL/SConscript index 1e8983d44..e63424ea3 100644 --- a/3rd/SDL/SConscript +++ b/3rd/SDL/SConscript @@ -58,6 +58,7 @@ elif OS_NAME == 'Linux': '/usr/lib/x86_64-linux-gnu/glib-2.0/include', '/usr/include/ibus-1.0', 'include', + '/usr/include/harfbuzz', 'gen', 'src/video/khronos', 'src/audio/alsa', diff --git a/3rd/fribidi/fribidi-common.h b/3rd/fribidi/fribidi-common.h index 0de5d704a..74d723c72 100644 --- a/3rd/fribidi/fribidi-common.h +++ b/3rd/fribidi/fribidi-common.h @@ -27,6 +27,7 @@ #define _FRIBIDI_COMMON_H #define HAVE_STDLIB_H 1 +#include #ifdef DONT_HAVE_FRIBIDI_CONFIG_H # define FRIBIDI "fribidi" diff --git a/README.md b/README.md index 256af58db..329f3b021 100644 --- a/README.md +++ b/README.md @@ -207,7 +207,7 @@ scons If scons and the dependent software pack aren't installed, please run the following command in the terminal: ``` -sudo apt-get install scons libsndio-dev libgtk-3-dev libglu1-mesa libglu1-mesa-dev libgl1-mesa-glx libgl1-mesa-dev libasound2-dev git vim clang-format libharfbuzz-dev +sudo apt-get install gcc g++ scons libsndio-dev libgtk-3-dev libglu1-mesa libglu1-mesa-dev libgl1-mesa-glx libgl1-mesa-dev libasound2-dev git vim clang-format libharfbuzz-dev ``` Compile and run (Enter the awtk directory and run the following command in the terminal): diff --git a/README_zh.md b/README_zh.md index 31b2fd7d4..f019c3f10 100644 --- a/README_zh.md +++ b/README_zh.md @@ -211,7 +211,7 @@ scons 如果没有安装 scons 和依赖的软件包，请在终端运行下面的命令： ``` -sudo apt-get install scons libsndio-dev libgtk-3-dev libglu1-mesa libglu1-mesa-dev libgl1-mesa-glx libgl1-mesa-dev libasound2-dev git vim clang-format libharfbuzz-dev +sudo apt-get install gcc g++ scons libsndio-dev libgtk-3-dev libglu1-mesa libglu1-mesa-dev libgl1-mesa-glx libgl1-mesa-dev libasound2-dev git vim clang-format libharfbuzz-dev ``` 编译运行 （在终端下，进入 awtk 所在的目录，并运行下列命令）：