[Scummvm-git-logs] scummvm master -> 59b0dd0b3dca2856beeadd12df81db3259fd7255

[ccawley2011]

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

Summary:
72a4ac3150 ULTIMA: Enable the base engine by default
59b0dd0b3d ULTIMA: Disable unused code when Ultima 1 is disabled


Commit: 72a4ac31501ed97e027a7c75bd679722598c4f1d
    https://github.com/scummvm/scummvm/commit/72a4ac31501ed97e027a7c75bd679722598c4f1d
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2023-11-30T21:22:50Z

Commit Message:
ULTIMA: Enable the base engine by default

Changed paths:
    engines/ultima/configure.engine


diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
index bf849aa483a..391f73a6bca 100644
--- a/engines/ultima/configure.engine
+++ b/engines/ultima/configure.engine
@@ -1,6 +1,6 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine ultima "Ultima" no "ultima1 ultima4 ultima6 ultima8"
+add_engine ultima "Ultima" yes "ultima1 ultima4 ultima6 ultima8"
 add_engine ultima1 "Ultima I - The First Age of Darkness" no "" "" ""	
 add_engine ultima4 "Ultima IV - Quest of the Avatar" yes "" "" ""
 add_engine ultima6 "Ultima VI = The False Prophet" yes "" "" "highres 16bit lua"


Commit: 59b0dd0b3dca2856beeadd12df81db3259fd7255
    https://github.com/scummvm/scummvm/commit/59b0dd0b3dca2856beeadd12df81db3259fd7255
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2023-11-30T21:24:21Z

Commit Message:
ULTIMA: Disable unused code when Ultima 1 is disabled

Changed paths:
    engines/ultima/module.mk


diff --git a/engines/ultima/module.mk b/engines/ultima/module.mk
index aad1ad4ef58..347e97621c7 100644
--- a/engines/ultima/module.mk
+++ b/engines/ultima/module.mk
@@ -2,14 +2,22 @@ MODULE := engines/ultima
 
 MODULE_OBJS := \
 	metaengine.o \
+	shared/conf/xml_node.o \
+	shared/conf/xml_tree.o \
+	shared/core/file.o \
+	shared/engine/ultima.o \
+	shared/engine/data_archive.o \
+	shared/engine/debugger.o \
+	shared/engine/events.o \
+	shared/std/string.o
+
+ifdef ENABLE_ULTIMA1
+MODULE_OBJS += \
 	shared/actions/action.o \
 	shared/actions/huh.o \
 	shared/actions/pass.o \
-	shared/conf/xml_node.o \
-	shared/conf/xml_tree.o \
 	shared/core/base_object.o \
 	shared/core/character.o \
-	shared/core/file.o \
 	shared/core/lzw.o \
 	shared/core/map.o \
 	shared/core/message_target.o \
@@ -24,10 +32,6 @@ MODULE_OBJS := \
 	shared/early/game.o \
 	shared/early/game_base.o \
 	shared/early/ultima_early.o \
-	shared/engine/ultima.o \
-	shared/engine/data_archive.o \
-	shared/engine/debugger.o \
-	shared/engine/events.o \
 	shared/engine/input_handler.o \
 	shared/engine/input_translator.o \
 	shared/engine/messages.o \
@@ -52,10 +56,6 @@ MODULE_OBJS := \
 	shared/maps/map_tile.o \
 	shared/maps/map_widget.o \
 	shared/maps/creature.o \
-	shared/std/string.o
-
-ifdef ENABLE_ULTIMA1
-MODULE_OBJS += \
 	ultima0/core/resources.o \
 	ultima0/game.o \
 	ultima0/resources.o \