Skip to content

Commit 6608398

Browse files
Merge pull request #19 from ricardoquesada/readme_fixes
minor fixes in readme
2 parents a401ec6 + 3ceee8f commit 6608398

File tree

2 files changed

+25
-21
lines changed

2 files changed

+25
-21
lines changed

README.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,24 @@ We have one build script for each platform, they are under `build` directory.
7171
All of them share the same usage:
7272

7373
```
74-
./build.sh -p=param0 --libs=param1 --arch=param2 --mode=param3 --list
74+
./build.sh -p=platform --libs=libs --arch=arch --mode=mode --list
7575
```
7676

77-
- param0: specify a platform, only (ios, mac, android, linux and tizen ) are valid values.
77+
- platform: specify a platform. Supported platforms: ios, mac, android, linux and tizen
7878

79-
- param1:
80-
- use `all` to build all the 3rd party libraries, it will take you a very long time.
81-
- use comma separated library names, for example, `png,lua,jpeg,webp`, no space between the comma.
79+
libs:
80+
- use `all` to build all the 3rd party libraries.
81+
- use comma separated library names, for example, `png,lua,jpeg,webp`, no space between the comma to select one or more libs
8282

83-
- param2:
84-
- use `all` to build all the supported arches. For iOS, they are "armv7, arm64, i386, x86_64", for Android, they are "arm,armv7,arm64,x86", for Mac, they are "x86_64", for Tizen, they are "armv7"
83+
arch:
84+
- use `all` to build all the supported architectures.
85+
- for iOS, they are "armv7, arm64, i386, x86_64"
86+
- for Android, they are "arm,armv7,arm64,x86"
87+
- for Mac, they are "x86_64"
88+
- for Tizen, they are "armv7"
8589
- use comma separated arch name, for example, `armv7, arm64`, no space between the comma.
8690

87-
- param3:
91+
- mode:
8892
- release: Build library on release mode. This is the default option. We use `-O3 -DNDEBUG` flags to build release library.
8993
- debug: Build library on debug mode. we use `-O0 -g -DDEBUG` flag to build debug library.
9094

build/build.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ if [ $cfg_platform_name = "android" ];then
165165
echo "Invalid gcc version number! Gcc version should be numerical numbers."
166166
usage
167167
exit 1
168-
fi
168+
fi
169169

170170
fi
171171

@@ -295,7 +295,7 @@ do
295295

296296
#set build mode flags -- debug or release
297297
set_build_mode_cflags
298-
298+
299299

300300
install_library_path="install-${cfg_platform_name}"
301301
build_library_path=$cfg_platform_name
@@ -307,7 +307,7 @@ do
307307
if [ -z $original_arch_name ];then
308308
original_arch_name=$arch
309309
fi
310-
310+
311311
MY_TARGET_ARCH=$original_arch_name
312312
export MY_TARGET_ARCH
313313

@@ -328,7 +328,7 @@ do
328328

329329
fi
330330

331-
331+
332332
mkdir -p "${top_dir}/contrib/${cfg_platform_name}-${arch}"
333333
cd "${top_dir}/contrib/${cfg_platform_name}-${arch}"
334334

@@ -344,20 +344,20 @@ do
344344
--host=${!my_target_host} \
345345
--prefix=${PREFIX}
346346

347-
347+
348348
echo "MY_TARGET_ARCH := ${MY_TARGET_ARCH}" >> config.mak
349349
echo "OPTIM := ${OPTIM}" >> config.mak
350-
350+
351351
make
352352

353-
cd -
354-
353+
cd -
354+
355355
local_library_install_path=$cfg_platform_name/$archive_name/prebuilt/$original_arch_name
356356
if [ ! -d $local_library_install_path ]; then
357357
echo "create folder for library with specify arch. $local_library_install_path"
358358
mkdir -p $local_library_install_path
359359
fi
360-
360+
361361
#determine the .a achive name with a specified libraries
362362
parse_original_lib_name=${lib}_original_name
363363
original_archive_name=${!parse_original_lib_name}
@@ -373,7 +373,7 @@ do
373373
original_dependent_archive_list=${!parse_dependent_archive_list}
374374
if [ ! -z $original_dependent_archive_list ];then
375375
echo "copying dependent archives..."
376-
original_dependent_archive_list=(${original_dependent_archive_list//,/ })
376+
original_dependent_archive_list=(${original_dependent_archive_list//,/ })
377377

378378
for dep_archive in ${original_dependent_archive_list[@]}
379379
do
@@ -399,18 +399,18 @@ do
399399

400400
echo $cfg_build_fat_library
401401
if [ $cfg_build_fat_library = "yes" ];then
402-
402+
403403
create_fat_library $archive_name
404404

405405
parse_dependent_archive_list=${lib}_dependent_archive_list
406406
original_dependent_archive_list=${!parse_dependent_archive_list}
407407
if [ ! -z $original_dependent_archive_list ];then
408408
echo "create fat library for dependent archives..."
409-
original_dependent_archive_list=(${original_dependent_archive_list//,/ })
409+
original_dependent_archive_list=(${original_dependent_archive_list//,/ })
410410

411411
for dep_archive in ${original_dependent_archive_list[@]}
412412
do
413-
create_fat_library $dep_archive
413+
create_fat_library $dep_archive
414414
done
415415
fi
416416
fi

0 commit comments

Comments
 (0)