zlgopen/awtk
1
0
Fork 0
mirror of https://github.com/zlgopen/awtk.git synced 2025-05-10 04:18:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

ubuntu version support ime

Browse Source
This commit is contained in:
lixianjing 2021-01-29 12:25:29 +08:00
parent 838419d273
commit fff6882cf5
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rd/SDL/SConscript
View File

@ -98,5 +98,10 @@ elif OS_NAME == 'Linux':
CCFLAGS=os.environ['CCFLAGS']; CCFLAGS=os.environ['CCFLAGS'];
CCFLAGS = CCFLAGS + ' -DSDL_STATIC_LIB -D__FLTUSED__ ' CCFLAGS = CCFLAGS + ' -DSDL_STATIC_LIB -D__FLTUSED__ '
if OS_NAME == 'Linux':
if os.environ['SDL_UBUNTU_USE_IME'] == str(True) :
CCFLAGS = CCFLAGS + ' -DSDL_USE_IME -DHAVE_FCITX_FRONTEND_H -DHAVE_IBUS_IBUS_H -DHAVE_DBUS_DBUS_H -DHAVE_GETENV '
env.Library(os.path.join(LIB_DIR, 'SDL2'), sources, CPPPATH = CPPPATH, CCFLAGS = CCFLAGS) env.Library(os.path.join(LIB_DIR, 'SDL2'), sources, CPPPATH = CPPPATH, CCFLAGS = CCFLAGS)

1
3rd/SDL/src/stdlib/SDL_getenv.c
View File

@ -172,6 +172,7 @@ SDL_setenv(const char *name, const char *value, int overwrite)
/* Retrieve a variable named "name" from the environment */ /* Retrieve a variable named "name" from the environment */
#if defined(HAVE_GETENV) #if defined(HAVE_GETENV)
#include <stdlib.h>
char * char *
SDL_getenv(const char *name) SDL_getenv(const char *name)
{ {

2
README.md
View File

@ -208,7 +208,7 @@ scons
If scons and the dependent software pack aren't installed, please run the following command in the terminal: If scons and the dependent software pack aren't installed, please run the following command in the terminal:
``` ```
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 nodejs 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 libibus-1.0-dev fcitx-libs-dev git vim clang-format libharfbuzz-dev nodejs
``` ```
Compile and run (Enter the awtk directory and run the following command in the terminal): Compile and run (Enter the awtk directory and run the following command in the terminal):

2
README_zh.md
View File

@ -213,7 +213,7 @@ scons
如果没有安装 scons 和依赖的软件包，请在终端运行下面的命令： 如果没有安装 scons 和依赖的软件包，请在终端运行下面的命令：
``` ```
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 nodejs 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 libibus-1.0-dev fcitx-libs-dev git vim clang-format libharfbuzz-dev nodejs
``` ```
编译运行 （在终端下，进入 awtk 所在的目录，并运行下列命令）： 编译运行 （在终端下，进入 awtk 所在的目录，并运行下列命令）：

3
awtk_config.py
View File

@ -289,6 +289,9 @@ os.environ['STATIC_LIBS'] = ';'.join(STATIC_LIBS)
os.environ['WITH_AWTK_SO'] = 'true' os.environ['WITH_AWTK_SO'] = 'true'
os.environ['AWTK_CCFLAGS'] = AWTK_CCFLAGS; os.environ['AWTK_CCFLAGS'] = AWTK_CCFLAGS;
os.environ['SDL_UBUNTU_USE_IME'] = str(False)
# os.environ['SDL_UBUNTU_USE_IME'] = str(True)
def has_custom_cc(): def has_custom_cc():
return False return False