Adapt build job to lhelper-2
This commit is contained in:
parent
b9bb64a2f0
commit
ed99623ad3
|
@ -0,0 +1,8 @@
|
|||
CC="${CC:-gcc}"
|
||||
CXX="${CXX:-g++}"
|
||||
CFLAGS=
|
||||
CXXFLAGS=
|
||||
LDFLAGS=
|
||||
BUILD_TYPE=Release
|
||||
|
||||
packages=(pcre2 freetype2 sdl2 lua)
|
|
@ -51,25 +51,23 @@ main() {
|
|||
pushd lhelper; bash install "${lhelper_prefix}"; popd
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
CC=clang CXX=clang++ lhelper create lite-xl -n
|
||||
CC=clang CXX=clang++ lhelper create build
|
||||
else
|
||||
lhelper create lite-xl -n
|
||||
lhelper create lite-xl build
|
||||
fi
|
||||
fi
|
||||
|
||||
# Not using $(lhelper activate lite-xl) to support CI
|
||||
source "$(lhelper env-source lite-xl)"
|
||||
|
||||
lhelper install freetype2
|
||||
lhelper install sdl2 2.0.14-wait-event-timeout-1
|
||||
lhelper install pcre2
|
||||
source "$(lhelper env-source build)"
|
||||
|
||||
# Help MSYS2 to find the SDL2 include and lib directories to avoid errors
|
||||
# during build and linking when using lhelper.
|
||||
if [[ "$OSTYPE" == "msys" ]]; then
|
||||
CFLAGS=-I${LHELPER_ENV_PREFIX}/include/SDL2
|
||||
LDFLAGS=-L${LHELPER_ENV_PREFIX}/lib
|
||||
fi
|
||||
# Francesco: not sure why this is needed. I have never observed the problem when
|
||||
# building on window.
|
||||
# if [[ "$OSTYPE" == "msys" ]]; then
|
||||
# CFLAGS=-I${LHELPER_ENV_PREFIX}/include/SDL2
|
||||
# LDFLAGS=-L${LHELPER_ENV_PREFIX}/lib
|
||||
# fi
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
|
Loading…
Reference in New Issue