[Scummvm-git-logs] scummvm master -> 719d9017b7b9570c3ef0f13d84f6631226a98142

eriktorbjorn eriktorbjorn at telia.com
Thu Jul 1 13:57:45 UTC 2021


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:
719d9017b7 SAGA + SAGA2: Fix build


Commit: 719d9017b7b9570c3ef0f13d84f6631226a98142
    https://github.com/scummvm/scummvm/commit/719d9017b7b9570c3ef0f13d84f6631226a98142
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-07-01T15:57:05+02:00

Commit Message:
SAGA + SAGA2: Fix build

Changed paths:
    engines/saga/module.mk
    engines/saga2/shorten.cpp


diff --git a/engines/saga/module.mk b/engines/saga/module.mk
index 54d0fddb19..1ba14468ed 100644
--- a/engines/saga/module.mk
+++ b/engines/saga/module.mk
@@ -29,7 +29,6 @@ MODULE_OBJS := \
 	scene.o \
 	script.o \
 	sfuncs.o \
-	shorten.o \
 	sndres.o \
 	sound.o \
 	sprite.o \
diff --git a/engines/saga2/shorten.cpp b/engines/saga2/shorten.cpp
index 743109de78..5e9d90da9f 100644
--- a/engines/saga2/shorten.cpp
+++ b/engines/saga2/shorten.cpp
@@ -25,7 +25,7 @@
 #include "common/textconsole.h"
 #include "audio/audiostream.h"
 
-#include "saga/shorten.h"
+#include "saga2/shorten.h"
 
 // Based on etree's Shorten tool, version 3.6.1
 // http://etree.org/shnutils/shorten/




More information about the Scummvm-git-logs mailing list