Skip to content

Commit 8dc5866

Browse files
committed
finish linux platform
1 parent 0de3c45 commit 8dc5866

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

build/build.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,11 @@ do
338338
cd "${top_dir}/contrib/${cfg_platform_name}-${arch}"
339339

340340
PREFIX="${top_dir}/contrib/install-${cfg_platform_name}/${arch}"
341+
341342
my_target_host=cfg_${arch}_host_machine
343+
if [ $cfg_is_cross_compile = "no" ];then
344+
cfg_build_machine=${!my_target_host}
345+
fi
342346

343347
../bootstrap --enable-$lib \
344348
--build=$cfg_build_machine \

build/linux.ini

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ cfg_default_build_libraries="all"
1313
cfg_help_arch_string="i386,x86_64"
1414
cfg_help_sample_string="./build.sh -p=linux --libs=png --arch=i368,x86_64 --mode=debug"
1515

16-
cfg_library_install_prefix="install-${cfg_platform_name}"
17-
cfg_library_build_folder="${cfg_platform_name}"
18-
cfg_build_fat_library=no
16+
cfg_is_cross_compile=no
17+
cfg_build_machine="x86_64-linux-gnu"
18+
cfg_x86_64_host_machine="x86_64-linux-gnu"
19+
cfg_i386_host_machine="i386-linux-gnu"
1920

2021

2122
cfg_all_supported_arches=("i386" "x86_64")
@@ -24,17 +25,7 @@ cfg_default_arches_all=("x86_64")
2425
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl")
2526

2627

28+
cfg_build_fat_library=no
2729
cfg_build_release_mode="-O3 -DNDEBUG"
2830
cfg_build_debug_mode="-O0 -g -DDEBUG"
2931

30-
function build_settings_for_linux()
31-
{
32-
linux_arch=$1
33-
34-
PREFIX="${top_dir}/contrib/install-${cfg_platform_name}/${linux_arch}"
35-
pushd "${top_dir}/contrib"
36-
mkdir -p "${cfg_platform_name}-${linux_arch}" && cd "${cfg_platform_name}-${linux_arch}"
37-
38-
../bootstrap --enable-$2 --build=${linux_arch}-linux-gnu --host=${linux_arch}-linux-gnu --prefix=${PREFIX}
39-
40-
}

0 commit comments

Comments
 (0)