walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 13 Wiki Activity

Adapt build job to lhelper-2

This commit is contained in:
Francesco Abbate 2022-06-28 19:43:52 +02:00
parent b9bb64a2f0
commit ed99623ad3
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.lhelper Normal file
View File

@ -0,0 +1,8 @@
CC="${CC:-gcc}"
CXX="${CXX:-g++}"
CFLAGS=
CXXFLAGS=
LDFLAGS=
BUILD_TYPE=Release
packages=(pcre2 freetype2 sdl2 lua)

20
scripts/lhelper.sh
View File

@ -51,25 +51,23 @@ main() {
pushd lhelper; bash install "${lhelper_prefix}"; popd pushd lhelper; bash install "${lhelper_prefix}"; popd
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
CC=clang CXX=clang++ lhelper create lite-xl -n CC=clang CXX=clang++ lhelper create build
else else
lhelper create lite-xl -n lhelper create lite-xl build
fi fi
fi fi
# Not using $(lhelper activate lite-xl) to support CI # Not using $(lhelper activate lite-xl) to support CI
source "$(lhelper env-source lite-xl)" source "$(lhelper env-source build)"
lhelper install freetype2
lhelper install sdl2 2.0.14-wait-event-timeout-1
lhelper install pcre2
# Help MSYS2 to find the SDL2 include and lib directories to avoid errors # Help MSYS2 to find the SDL2 include and lib directories to avoid errors
# during build and linking when using lhelper. # during build and linking when using lhelper.
if [[ "$OSTYPE" == "msys" ]]; then # Francesco: not sure why this is needed. I have never observed the problem when
CFLAGS=-I${LHELPER_ENV_PREFIX}/include/SDL2 # building on window.
LDFLAGS=-L${LHELPER_ENV_PREFIX}/lib # if [[ "$OSTYPE" == "msys" ]]; then
fi # CFLAGS=-I${LHELPER_ENV_PREFIX}/include/SDL2
# LDFLAGS=-L${LHELPER_ENV_PREFIX}/lib
# fi
} }
main "$@" main "$@"