chore(linux): update include paths

This commit is contained in:
Marc Durdin 2022-08-11 13:18:28 +02:00
parent dedb06e7cc
commit 600f6bfec4
4 changed files with 4 additions and 4 deletions

View file

@ -2,7 +2,7 @@
"configurations": [
{
"name": "linux",
"includePath": ["${workspaceFolder}/core/include/**"],
"includePath": ["${workspaceFolder}/core/include/**", "${workspaceFolder}/common/include/**"],
"defines": [],
"compilerPath": "/usr/lib/ccache/clang",
"cStandard": "c11",

View file

@ -66,7 +66,7 @@
"label": "ibus-keyman: configure",
"command": "./configure",
"args": [
"CPPFLAGS=\"-DG_MESSAGES_DEBUG -I${workspaceFolder}/core/build/arch/debug/include/ -I${workspaceFolder}/core/include/\"",
"CPPFLAGS=\"-DG_MESSAGES_DEBUG -I${workspaceFolder}/core/build/arch/debug/include/ -I${workspaceFolder}/common/include/ -I${workspaceFolder}/core/include/\"",
"CFLAGS=\"-g -O0\"",
"CXXFLAGS=\"-g -O0\"",
"KEYMAN_PROC_LIBS=\"-L${workspaceFolder}/common/core/desktop/build/arch/debug/src -lkmnkbp0\"",

View file

@ -26,7 +26,7 @@ override_dh_auto_configure:
# ibus-keyman
cd linux/ibus-keyman && \
cp -f ../../VERSION.md VERSION && \
export KEYMAN_PROC_CFLAGS="-I$(CURDIR)/core/build/arch/release/include -I$(CURDIR)/core/include" && \
export KEYMAN_PROC_CFLAGS="-I$(CURDIR)/core/build/arch/release/include -I$(CURDIR)/common/include -I$(CURDIR)/core/include" && \
export KEYMAN_PROC_LIBS="-L$(CURDIR)/core/build/arch/release/src -lkmnkbp0" && \
export PKG_CONFIG_PATH=$(CURDIR)/core/build/arch/release/meson-private && \
./autogen.sh && \

View file

@ -24,6 +24,6 @@ For a debug build:
To use the header files from the source repo, you need to specify paths to the include files in core:
```bash
./configure CPPFLAGS="-DG_MESSAGES_DEBUG -I../../core/build/arch/debug/include/ -I../../core/include/" \
./configure CPPFLAGS="-DG_MESSAGES_DEBUG -I../../core/build/arch/debug/include/ -I../../common/include/ -I../../core/include/" \
CFLAGS="-g -O0" CXXFLAGS="-g -O0"
```