[Scummvm-git-logs] scummvm branch-2-9 -> 629a31bf8c6f60539a3c609c8dfc7243560bbdd2

bluegr noreply at scummvm.org
Fri Dec 6 14:58:58 UTC 2024


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:
654778d62d KOLIBRI: Use _ksys_getcwd instead of getcwd
4ae2494843 KOLIBRI: Fix freetype detection on kolibri
057df3bbbb KOLIBRI: Remove explicit disabling of ags
629a31bf8c KOLIBRI: Bump compilation thread count to 12


Commit: 654778d62d12c62b59d678631a7407fa14306c23
    https://github.com/scummvm/scummvm/commit/654778d62d12c62b59d678631a7407fa14306c23
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-12-06T16:58:52+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: 4ae2494843aa86195f8cc9324a92da9691e8888f
    https://github.com/scummvm/scummvm/commit/4ae2494843aa86195f8cc9324a92da9691e8888f
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-12-06T16:58:52+02:00

Commit Message:
KOLIBRI: Fix freetype detection on kolibri

Changed paths:
    configure


diff --git a/configure b/configure
index 24702a05d6d..72b2758189f 100755
--- a/configure
+++ b/configure
@@ -3626,6 +3626,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: 057df3bbbbe358a3d40e0f8f99b64b2c4e2630ce
    https://github.com/scummvm/scummvm/commit/057df3bbbbe358a3d40e0f8f99b64b2c4e2630ce
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-12-06T16:58:52+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: 629a31bf8c6f60539a3c609c8dfc7243560bbdd2
    https://github.com/scummvm/scummvm/commit/629a31bf8c6f60539a3c609c8dfc7243560bbdd2
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-12-06T16:58:52+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




More information about the Scummvm-git-logs mailing list