[Scummvm-git-logs] scummvm master -> 49e43701d5637cdcd6aa1b2ba2c2bd86cc493cf6

[sev-]

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:
49e43701d5 CONFIGURE: Turned gif into a component


Commit: 49e43701d5637cdcd6aa1b2ba2c2bd86cc493cf6
    https://github.com/scummvm/scummvm/commit/49e43701d5637cdcd6aa1b2ba2c2bd86cc493cf6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-12-27T13:20:50+01:00

Commit Message:
CONFIGURE: Turned gif into a component

Changed paths:
    configure
    engines/twine/configure.engine
    image/module.mk


diff --git a/configure b/configure
index eb4c53af84d..6566635e006 100755
--- a/configure
+++ b/configure
@@ -308,7 +308,6 @@ add_feature faad "libfaad" "_faad"
 add_feature flac "FLAC" "_flac"
 add_feature fribidi "FriBidi" "_fribidi"
 add_feature freetype2 "FreeType2" "_freetype2"
-add_feature gif "GIF" "_gif"
 add_feature highres "high resolution" "_highres"
 add_feature jpeg "JPEG" "_jpeg"
 add_feature mad "MAD" "_mad"
@@ -322,6 +321,7 @@ add_feature test_cxx11 "Test C++11" "_test_cxx11"
 # Components are features which may be disabled if unused by the engines
 add_component enet "ENet" "_enet" "USE_ENET"
 add_component fmtowns_pc98_audio "FM-TOWNS/PC98 audio" "_fmtowns_pc98_audio" "USE_FMTOWNS_PC98_AUDIO"
+add_component gif "GIF" "_gif" "USE_GIF"
 add_component hnm "HNM" "_hnm" "USE_HNM"
 add_component imgui "Dear ImGui based debugger" "_imgui" "USE_IMGUI"
 add_component indeo3 "Indeo 3" "_indeo3" "USE_INDEO3"
@@ -5435,7 +5435,6 @@ if test "$_gif" = yes ; then
 	append_var LIBS "$GIF_LIBS"
 	append_var INCLUDES "$GIF_CFLAGS"
 fi
-define_in_config_if_yes "$_gif" 'USE_GIF'
 echo "$_gif"
 
 #
diff --git a/engines/twine/configure.engine b/engines/twine/configure.engine
index c2496a8d61e..e27cb6ac1df 100644
--- a/engines/twine/configure.engine
+++ b/engines/twine/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine twine "Little Big Adventure" yes "" "" "highres" "imgui midi"
+add_engine twine "Little Big Adventure" yes "" "" "highres gif" "imgui midi"
diff --git a/image/module.mk b/image/module.mk
index 5eb58c2a1a0..1eee3be286e 100644
--- a/image/module.mk
+++ b/image/module.mk
@@ -4,7 +4,6 @@ MODULE_OBJS := \
 	ani.o \
 	bmp.o \
 	cel_3do.o \
-	gif.o \
 	icocur.o \
 	iff.o \
 	jpeg.o \
@@ -32,6 +31,11 @@ MODULE_OBJS := \
 	codecs/truemotion1.o \
 	codecs/xan.o
 
+ifdef USE_GIF
+MODULE_OBJS += \
+	gif.o
+endif
+
 ifdef USE_MPEG2
 MODULE_OBJS += \
 	codecs/mpeg.o