tdlight-team/tdlight-java-natives
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Andrea Cavalli 2022-02-19 01:10:17 +01:00
parent 8c5821aa49
commit eb712d6c21
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/core/compile_tdjni.sh
View File

@ -8,6 +8,8 @@
# CPU_CORES = "-- -j<cores>" or "-m" on Windows # CPU_CORES = "-- -j<cores>" or "-m" on Windows
# OTHER REQUIRED ENVIRONMENT VARIABLES: # OTHER REQUIRED ENVIRONMENT VARIABLES:
# CMAKE_EXTRA_ARGUMENTS = <args> # CMAKE_EXTRA_ARGUMENTS = <args>
# OPTIONAL ENVIRONMENT VARIABLES:
# CROSS_BUILD_DEPS_DIR = <args>
# Check variables correctness # Check variables correctness
if [ -z "${OPERATING_SYSTEM_NAME}" ]; then if [ -z "${OPERATING_SYSTEM_NAME}" ]; then

4
scripts/core/setup-variables.sh
View File

@ -70,7 +70,6 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then
export CPU_CORES_NUM="2" export CPU_CORES_NUM="2"
unset CROSS_BUILD_DEPS_DIR
if [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then if [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then
export CMAKE_EXTRA_ARGUMENTS_TDJNI="${CMAKE_EXTRA_ARGUMENTS_TDJNI} -DOPENSSL_USE_STATIC_LIBS=True" export CMAKE_EXTRA_ARGUMENTS_TDJNI="${CMAKE_EXTRA_ARGUMENTS_TDJNI} -DOPENSSL_USE_STATIC_LIBS=True"
elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
@ -94,9 +93,6 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then
export CROSS_CC="${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-gcc" export CROSS_CC="${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-gcc"
export CROSS_CXX="${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-g++" export CROSS_CXX="${CPU_ARCH_CMAKE}-linux-${CPU_COMPILATION_TOOL}-g++"
fi fi
CROSS_BUILD_DEPS_DIR="$(realpath "../../")/.cache/tdlib-build-cross-${CPU_ARCH_DPKG}"
export CROSS_BUILD_DEPS_DIR
fi fi
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"