[Scummvm-git-logs] scummvm master -> e29c1514049d7d8ec2eb524202e5831b3fc42187

[phcoder]

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

Summary:
e29c151404 KOLIBRI: Fix paths to tools


Commit: e29c1514049d7d8ec2eb524202e5831b3fc42187
    https://github.com/scummvm/scummvm/commit/e29c1514049d7d8ec2eb524202e5831b3fc42187
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-02-26T23:20:15+01:00

Commit Message:
KOLIBRI: Fix paths to tools

Changed paths:
    backends/platform/sdl/kolibrios/kolibrios.mk
    configure


diff --git a/backends/platform/sdl/kolibrios/kolibrios.mk b/backends/platform/sdl/kolibrios/kolibrios.mk
index 6de4096498a..365862f147c 100644
--- a/backends/platform/sdl/kolibrios/kolibrios.mk
+++ b/backends/platform/sdl/kolibrios/kolibrios.mk
@@ -4,7 +4,7 @@ all: scummvm.kos $(EXECUTABLE)
 
 scummvm.kos: $(srcdir)/backends/platform/sdl/kolibrios/wrapper-main.c
 	+$(QUIET_CC)$(CXX) -I$(KOS32_SDK_DIR)/sources/newlib/libc/include -specs=$(srcdir)/backends/platform/sdl/kolibrios/kolibrios.spec -x c -o $@.coff $<
-	+$(QUIET)$(KOS32_AUTOBUILD)/bin/kos32-objcopy $@.coff -O binary $@
+	+$(QUIET)$(KOS32_AUTOBUILD)/tools/win32/bin/kos32-objcopy $@.coff -O binary $@
 
 $(bundle): all
 	$(RM) -rf $(bundle)
diff --git a/configure b/configure
index 33cf145586a..7c263e049e8 100755
--- a/configure
+++ b/configure
@@ -1868,12 +1868,12 @@ kolibrios)
 		echo "Please set KOS32_SDK_DIR and KOS32_AUTOBUILD in your environment. export KOS32_SDK_DIR=<path to KOS32 SDK> and export KOS32_AUTOBUILD=<path to KOS32 build>"
 		exit 1
 	fi
-	_as="${KOS32_AUTOBUILD}/bin/kos32-as"
-	_ar="${KOS32_AUTOBUILD}/bin/kos32-ar cr"
-	_ranlib="${KOS32_AUTOBUILD}/bin/kos32-ar -s"
-	_strip="${KOS32_AUTOBUILD}/bin/kos32-strip"
+	_as="${KOS32_AUTOBUILD}/tools/win32/bin/kos32-as"
+	_ar="${KOS32_AUTOBUILD}/tools/win32/bin/kos32-ar cr"
+	_ranlib="${KOS32_AUTOBUILD}/tools/win32/bin/kos32-ar -s"
+	_strip="${KOS32_AUTOBUILD}/tools/win32/bin/kos32-strip"
 	if test -z "$CXX"; then
-		CXX="${KOS32_AUTOBUILD}/bin/kos32-g++"
+		CXX="${KOS32_AUTOBUILD}/tools/win32/bin/kos32-g++"
 	fi
 	append_var DEFINES "-U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -DKOLIBRIOS=1 -D_POSIX_C_SOURCE=1 -D_XOPEN_SOURCE=1"
 	append_var CXXFLAGS "-I${KOS32_SDK_DIR}/sources/newlib/libc/include -I${KOS32_SDK_DIR}/sources/libstdc++-v3/include -fno-ident -fomit-frame-pointer"