Linux fixes (#2)

MultiCraft · Dec 23, 2024 · 3e035e6 · 3e035e6
1 parent 9a805dc
commit 3e035e6
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 29 deletions.
diff --git a/SDL2.sh b/SDL2.sh
@@ -2,7 +2,7 @@
 
 SDL2_VERSION=2.30.10
 
-. sdk.sh
+. ./sdk.sh
 
 mkdir -p output/sdl2/lib/$TARGET_ABI
 mkdir -p deps; cd deps

diff --git a/Start.sh b/Start.sh
@@ -6,7 +6,15 @@ ARCHS=("armv7" "arm64" "x86_64")
 for ARCH in "${ARCHS[@]}"; do
 echo "Building for ARCH: $ARCH"
 
-sed -i '' '/^arch/d' local.properties
+case "$OSTYPE" in
+	darwin*)
+	sed -i '' '/^arch/d' local.properties
+	;;
+	*)
+	touch local.properties
+	sed -i '/^arch/d' local.properties
+	;;
+esac
 echo "arch = $ARCH" >> local.properties
 
 # Set NDK path
@@ -39,18 +47,20 @@ chmod -R u+w deps
 
 # Build libs
 
-sh gettext.sh
-sh leveldb.sh
-#sh luajit.sh
-sh libjpeg.sh
-sh libpng.sh
-sh freetype.sh
-sh SDL2.sh
-sh irrlicht.sh
-sh openal.sh
-sh openssl.sh
-sh libcurl.sh
-sh vorbis.sh
+./gettext.sh
+./leveldb.sh
+if [[ "$OSTYPE" == linux* ]]; then
+	./luajit.sh
+fi
+./libjpeg.sh
+./libpng.sh
+./freetype.sh
+./SDL2.sh
+./irrlicht.sh
+./openal.sh
+./openssl.sh
+./libcurl.sh
+./vorbis.sh
 
 echo "Done building for $ARCH!"
 done

diff --git a/freetype.sh b/freetype.sh
@@ -2,7 +2,7 @@
 
 FREETYPE_VERSION=2.13.3
 
-. sdk.sh
+. ./sdk.sh
 
 mkdir -p output/freetype/lib/$TARGET_ABI
 mkdir -p deps; cd deps
@@ -11,7 +11,7 @@ if [ ! -d freetype-src ]; then
 	if [ ! -f "freetype-$FREETYPE_VERSION.tar.xz" ]; then
 		wget https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE_VERSION/freetype-$FREETYPE_VERSION.tar.xz
 	fi
-	tar -xzf freetype-$FREETYPE_VERSION.tar.xz
+	tar -xJf freetype-$FREETYPE_VERSION.tar.xz
 	mv freetype-$FREETYPE_VERSION freetype-src
 	mkdir freetype-src/build
 fi

diff --git a/gettext.sh b/gettext.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-. sdk.sh
+. ./sdk.sh
 GETTEXT_VERSION=0.23
 
 mkdir -p output/gettext/lib/$TARGET_ABI
@@ -10,7 +10,7 @@ if [ ! -d gettext-src ]; then
 	if [ ! -f "gettext-$GETTEXT_VERSION.tar.xz" ]; then
 		wget https://ftp.gnu.org/pub/gnu/gettext/gettext-$GETTEXT_VERSION.tar.xz
 	fi
-	tar -xzf gettext-$GETTEXT_VERSION.tar.xz
+	tar -xJf gettext-$GETTEXT_VERSION.tar.xz
 	mv gettext-$GETTEXT_VERSION gettext-src
 fi
 

diff --git a/irrlicht.sh b/irrlicht.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-. sdk.sh
+. ./sdk.sh
 
 mkdir -p output/irrlicht/lib/$TARGET_ABI
 mkdir -p deps; cd deps

diff --git a/leveldb.sh b/leveldb.sh
@@ -2,7 +2,7 @@
 
 LEVELDB_VERSION=1.23
 
-. sdk.sh
+. ./sdk.sh
 
 mkdir -p output/leveldb/lib/$TARGET_ABI
 mkdir -p deps; cd deps

diff --git a/libcurl.sh b/libcurl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
-. sdk.sh
-CURL_VERSION=8.11.0
+. ./sdk.sh
+CURL_VERSION=8.11.1
 
 export ANDR_ROOT=$(pwd)
 

diff --git a/libjpeg.sh b/libjpeg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-. sdk.sh
+. ./sdk.sh
 JPEG_VERSION=3.1.0
 
 mkdir -p output/libjpeg/lib/$TARGET_ABI

diff --git a/libpng.sh b/libpng.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-. sdk.sh
+. ./sdk.sh
 PNG_VERSION=1.6.44
 
 mkdir -p output/libpng/lib/$TARGET_ABI

diff --git a/luajit.sh b/luajit.sh
@@ -2,7 +2,7 @@
 
 LUAJIT_VERSION=2.1
 
-. sdk.sh
+. ./sdk.sh
 
 mkdir -p output/luajit/lib/$TARGET_ABI
 mkdir -p deps; cd deps

diff --git a/mbedtls.sh b/mbedtls.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-. sdk.sh
+. ./sdk.sh
 MBEDTLS_VERSION=3.6.1
 
 mkdir -p output/mbedtls/lib/$TARGET_ABI

diff --git a/openal.sh b/openal.sh
@@ -2,7 +2,7 @@
 
 OPENAL_VERSION=1.22.2
 
-. sdk.sh
+. ./sdk.sh
 
 export SDL_PATH="$(pwd)/deps/sdl2-src"
 

diff --git a/openssl.sh b/openssl.sh
@@ -2,7 +2,7 @@
 
 OPENSSL_VERSION=3.4.0
 
-. sdk.sh
+. ./sdk.sh
 
 mkdir -p output/openssl/lib/$TARGET_ABI
 mkdir -p deps; cd deps

diff --git a/vorbis.sh b/vorbis.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-. sdk.sh
+. ./sdk.sh
 
 export ANDR_ROOT=$(pwd)