[Scummvm-git-logs] scummvm master -> 2339ddc3261b87643201c6abf7f3ce5af4dc02d9

[bluegr]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e20adda52d KOLIBRI: Use _ksys_getcwd instead of getcwd
4cb942a4be KOLIBRI: Fix freetype detection on kolibri
050b806f73 KOLIBRI: Remove explicit disabling of ags
2339ddc326 KOLIBRI: Bump compilation thread count to 12


Commit: e20adda52d5154e84356150291d8aee63eae0ab6
    https://github.com/scummvm/scummvm/commit/e20adda52d5154e84356150291d8aee63eae0ab6
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-12-06T17:17:11+02:00

Commit Message:
KOLIBRI: Use _ksys_getcwd instead of getcwd

getcwd is apprently missing from SDK I tried. Whatever, just use _ksys_getcwd

Changed paths:
    backends/fs/kolibrios/kolibrios-fs-factory.cpp


diff --git a/backends/fs/kolibrios/kolibrios-fs-factory.cpp b/backends/fs/kolibrios/kolibrios-fs-factory.cpp
index 51f06268a75..0f8b0423f0a 100644
--- a/backends/fs/kolibrios/kolibrios-fs-factory.cpp
+++ b/backends/fs/kolibrios/kolibrios-fs-factory.cpp
@@ -39,7 +39,8 @@ AbstractFSNode *KolibriOSFilesystemFactory::makeRootFileNode() const {
 
 AbstractFSNode *KolibriOSFilesystemFactory::makeCurrentDirectoryFileNode() const {
 	char buf[MAXPATHLEN];
-	return getcwd(buf, MAXPATHLEN) ? new KolibriOSFilesystemNode(buf) : NULL;
+	_ksys_getcwd(buf, MAXPATHLEN);
+	return new KolibriOSFilesystemNode(buf);
 }
 
 AbstractFSNode *KolibriOSFilesystemFactory::makeFileNodePath(const Common::String &path) const {


Commit: 4cb942a4bebb4c0477f99d96474bd26606397191
    https://github.com/scummvm/scummvm/commit/4cb942a4bebb4c0477f99d96474bd26606397191
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-12-06T17:17:12+02:00

Commit Message:
KOLIBRI: Fix freetype detection on kolibri

Changed paths:
    configure


diff --git a/configure b/configure
index 8477e9490d2..9c05aa9e534 100755
--- a/configure
+++ b/configure
@@ -3629,6 +3629,7 @@ if test -n "$_host"; then
 
 			FREETYPE2_STATIC_LIBS="-lfreetype"
 			FREETYPE2_CFLAGS="-I${KOS32_SDK_DIR}/sources/freetype/include"
+			_freetypeconfig=
 			_freetype_found="true"
 
 			SDL_CFLAGS="-I${KOS32_SDK_DIR}/sources/SDL-1.2.2_newlib/include"


Commit: 050b806f732419382a28e82b3153838cebf17150
    https://github.com/scummvm/scummvm/commit/050b806f732419382a28e82b3153838cebf17150
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-12-06T17:17:12+02:00

Commit Message:
KOLIBRI: Remove explicit disabling of ags

Changed paths:
    backends/platform/sdl/kolibrios/build-kolibri.sh


diff --git a/backends/platform/sdl/kolibrios/build-kolibri.sh b/backends/platform/sdl/kolibrios/build-kolibri.sh
index a6ac3b5b881..ea365258111 100755
--- a/backends/platform/sdl/kolibrios/build-kolibri.sh
+++ b/backends/platform/sdl/kolibrios/build-kolibri.sh
@@ -6,6 +6,6 @@ export KOS32_SDK_DIR=$HOME/kolibrios/contrib/sdk
 export KOS32_AUTOBUILD=$HOME/autobuild
 
 # Use plugins for both engines and detection as KolibriOS has a limit per executable module
-./configure --host=kos32 --enable-release --enable-plugins --default-dynamic --enable-detection-dynamic --with-vorbis-prefix=$KOS32_SDK_DIR/sources/libvorbis-1.3.7  --with-ogg-prefix=$KOS32_SDK_DIR/sources/libogg-1.3.5 --enable-engine=testbed --disable-engine=ags
+./configure --host=kos32 --enable-release --enable-plugins --default-dynamic --enable-detection-dynamic --with-vorbis-prefix=$KOS32_SDK_DIR/sources/libvorbis-1.3.7  --with-ogg-prefix=$KOS32_SDK_DIR/sources/libogg-1.3.5 --enable-engine=testbed
 
 make -j5 all zip-root scummvm-zip


Commit: 2339ddc3261b87643201c6abf7f3ce5af4dc02d9
    https://github.com/scummvm/scummvm/commit/2339ddc3261b87643201c6abf7f3ce5af4dc02d9
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-12-06T17:17:13+02:00

Commit Message:
KOLIBRI: Bump compilation thread count to 12

Changed paths:
    backends/platform/sdl/kolibrios/build-kolibri.sh


diff --git a/backends/platform/sdl/kolibrios/build-kolibri.sh b/backends/platform/sdl/kolibrios/build-kolibri.sh
index ea365258111..60aa0dcc5be 100755
--- a/backends/platform/sdl/kolibrios/build-kolibri.sh
+++ b/backends/platform/sdl/kolibrios/build-kolibri.sh
@@ -8,4 +8,4 @@ export KOS32_AUTOBUILD=$HOME/autobuild
 # Use plugins for both engines and detection as KolibriOS has a limit per executable module
 ./configure --host=kos32 --enable-release --enable-plugins --default-dynamic --enable-detection-dynamic --with-vorbis-prefix=$KOS32_SDK_DIR/sources/libvorbis-1.3.7  --with-ogg-prefix=$KOS32_SDK_DIR/sources/libogg-1.3.5 --enable-engine=testbed
 
-make -j5 all zip-root scummvm-zip
+make -j12 all zip-root scummvm-zip