Skip to content

Commit 277de94

Browse files
committed
Minor changes
1 parent 340744f commit 277de94

File tree

14 files changed

+30
-29
lines changed

14 files changed

+30
-29
lines changed

freetype.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ cmake .. -DANDROID_STL="c++_static" \
3434

3535
cmake --build . -j
3636

37-
# update `include` folder
37+
# update headers
3838
rm -rf ../../../output/freetype/include/
3939
cp -r ../include ../../../output/freetype/include
4040
rm -rf ../../../output/freetype/include/dlg
4141
# update lib
4242
rm -rf ../../../output/freetype/lib/$TARGET_ABI/libfreetype.a
43-
cp -r libfreetype.a ../../../output/freetype/lib/$TARGET_ABI/libfreetype.a
43+
cp libfreetype.a ../../../output/freetype/lib/$TARGET_ABI/libfreetype.a
4444

4545
echo "Freetype build successful"

gettext.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ cd gettext-src/gettext-runtime
2020

2121
make -j
2222

23-
# update `include` folder
23+
# update headers
2424
rm -rf ../../../output/gettext/include
2525
mkdir -p ../../../output/gettext/include
26-
cp -r intl/libintl.h ../../../output/gettext/include/libintl.h
26+
cp intl/libintl.h ../../../output/gettext/include/libintl.h
27+
2728
# update lib
2829
rm -rf ../../../output/gettext/lib/$TARGET_ABI/libintl.a
29-
cp -r intl/.libs/libintl.a ../../../output/gettext/lib/$TARGET_ABI/libintl.a
30+
cp intl/.libs/libintl.a ../../../output/gettext/lib/$TARGET_ABI/libintl.a
3031

3132
echo "Gettext build successful"

irrlicht.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ $ANDROID_NDK/ndk-build -j \
2020
APP_CPPFLAGS="$APP_CXXFLAGS -I$OUTPUT_PATH/libjpeg/include -I$OUTPUT_PATH/libpng/include" \
2121
APP_STL="c++_static"
2222

23-
# update `include` folder
23+
# update headers
2424
rm -rf ../../../../../output/irrlicht/include
2525
cp -r ../../../include ../../../../../output/irrlicht/include
2626
# update lib
2727
rm -rf ../../../../../../../Irrlicht/lib/$TARGET_ABI/libIrrlicht.a
28-
cp -r ../../../lib/Android-SDL/$TARGET_ABI/libIrrlicht.a ../../../../../output/irrlicht/lib/$TARGET_ABI/libIrrlicht.a
28+
cp ../../../lib/Android-SDL/$TARGET_ABI/libIrrlicht.a ../../../../../output/irrlicht/lib/$TARGET_ABI/libIrrlicht.a
2929
# update shaders
3030
rm -rf ../../../../../output/irrlicht/shaders
3131
cp -r ../../../media/Shaders ../../../../../output/irrlicht/shaders

leveldb.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ cmake .. -DANDROID_STL="c++_static" \
3131

3232
cmake --build . -j
3333

34-
# update `include` folder
34+
# update headers
3535
rm -rf ../../../output/leveldb/include/
3636
cp -r ../include ../../../output/leveldb/include
3737
# update lib
3838
rm -rf ../../../output/leveldb/lib/$TARGET_ABI/libleveldb.a
39-
cp -r libleveldb.a ../../../output/leveldb/lib/$TARGET_ABI/libleveldb.a
39+
cp libleveldb.a ../../../output/leveldb/lib/$TARGET_ABI/libleveldb.a
4040

4141
echo "LevelDB build successful"

libSDL.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ cmake .. -DANDROID_STL="c++_static" \
4343
cmake --build . -j
4444
cmake --install .
4545

46-
# update `include` folder
46+
# update headers
4747
rm -rf ../../../output/libSDL/include/
4848
cp -r ../include ../../../output/libSDL/include
4949
# update lib
5050
rm -rf ../../../output/libSDL/lib/$TARGET_ABI/libSDL.a
51-
cp -r libSDL3.a ../../../output/libSDL/lib/$TARGET_ABI/libSDL.a
51+
cp libSDL3.a ../../../output/libSDL/lib/$TARGET_ABI/libSDL.a
5252

5353
echo "libSDL build successful"

libcurl.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ CFLAGS="$INCLUDE_DIRS $LIBRARY_DIRS $CFLAGS" \
3333

3434
make -j
3535

36-
# update `include` folder
36+
# update headers
3737
rm -rf ../../output/libcurl/include
3838
cp -r include ../../output/libcurl/
3939
# update lib
4040
rm -rf ../../output/libcurl/lib/$TARGET_ABI/libcurl.a
41-
cp -r lib/.libs/libcurl.a ../../output/libcurl/lib/$TARGET_ABI/
41+
cp -r lib/.libs/libcurl.a ../../output/libcurl/lib/$TARGET_ABI/libcurl.a
4242

4343
echo "libcurl build successful"

libjpeg.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ cmake .. -DANDROID_STL="c++_static" \
2828
cmake --build . -j
2929
make install -s
3030

31-
# update `include` folder
31+
# update headers
3232
rm -rf ../../../../libjpeg/include
3333
cp -r include ../../../output/libjpeg/include
3434
# update lib
3535
rm -rf ../../../output/libjpeg/lib/$TARGET_ABI/libjpeg.a
36-
cp -r libjpeg.a ../../../output/libjpeg/lib/$TARGET_ABI/libjpeg.a
36+
cp libjpeg.a ../../../output/libjpeg/lib/$TARGET_ABI/libjpeg.a
3737

3838
echo "libjpeg build successful"

libpng.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ cmake .. -DANDROID_STL="c++_static" \
2828

2929
cmake --build . -j
3030

31-
# update `include` folder
31+
# update headers
3232
rm -rf ../../../output/libpng/include
3333
mkdir -p ../../../output/libpng/include
3434
cp -v ../*.h ../../../output/libpng/include
3535
cp -v pnglibconf.h ../../../output/libpng/include
3636
# update lib
3737
rm -rf ../../../output/libpng/lib/$TARGET_ABI/libpng.a
38-
cp -r libpng16.a ../../../output/libpng/lib/$TARGET_ABI/libpng.a
38+
cp libpng16.a ../../../output/libpng/lib/$TARGET_ABI/libpng.a
3939

4040
echo "libpng build successful"

luajit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ mkdir -p ../../output/luajit/include
3838
cp src/*.h ../../output/luajit/include/
3939
# update lib
4040
rm -rf ../../output/luajit/lib/$TARGET_ABI/libluajit.a
41-
cp -r src/libluajit.a ../../output/luajit/lib/$TARGET_ABI/
41+
cp src/libluajit.a ../../output/luajit/lib/$TARGET_ABI/libluajit.a
4242

4343
echo "LuaJIT build successful"

nghttp2.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ cmake .. -DANDROID_STL="c++_static" \
3737

3838
cmake --build . -j
3939

40-
# update `include` folder
40+
# update headers
4141
rm -rf ../../../output/nghttp2/include/
4242
mkdir -p ../../../output/nghttp2/include/nghttp2
4343
cp -r ../lib/includes/nghttp2/*.h ../../../output/nghttp2/include/nghttp2
4444
cp -r lib/includes/nghttp2/*.h ../../../output/nghttp2/include/nghttp2
4545
# update lib
4646
rm -rf ../../../output/nghttp2/lib/$TARGET_ABI/libnghttp2.a
47-
cp -r lib/libnghttp2.a ../../../output/nghttp2/lib/$TARGET_ABI/libnghttp2.a
47+
cp lib/libnghttp2.a ../../../output/nghttp2/lib/$TARGET_ABI/libnghttp2.a
4848

4949
echo "nghttp2 build successful"

0 commit comments

Comments
 (0)