Commit 3ed2c6e1 authored by Tomas Carnecky's avatar Tomas Carnecky Committed by Keith Packard

Move MIT-SCREEN-SAVER from extmod to built-in

If we've built MIT-SCREEN-SAVER support, then just build it into the
main binary, rather than leaving it in extmod.
Signed-off-by: default avatarTomas Carnecky <tom@dbservice.com>
Reviewed-by: default avatarDaniel Stone <daniel@fooishbar.org>
Reviewed-by: default avatarJamey Sharp <jamey@minilop.net>
Signed-off-by: default avatarPeter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent b8c9ab0f
......@@ -58,7 +58,7 @@ endif
# MIT ScreenSaver extension
SCREENSAVER_SRCS = saver.c
if SCREENSAVER
MODULE_SRCS += $(SCREENSAVER_SRCS)
BUILTIN_SRCS += $(SCREENSAVER_SRCS)
endif
# Xinerama extension: making multiple video devices act as one virtual screen
......
......@@ -47,14 +47,6 @@ static ExtensionModule extensionModules[] = {
NULL,
NULL},
#endif
#ifdef SCREENSAVER
{
ScreenSaverExtensionInit,
ScreenSaverName,
&noScreenSaverExtension,
NULL,
NULL},
#endif
#ifdef XF86VIDMODE
{
XFree86VidModeExtensionInit,
......
......@@ -110,7 +110,7 @@ extern Bool noResExtension;
extern void ResExtensionInit(void);
#endif
#if defined(SCREENSAVER) && !defined(XorgLoader)
#if defined(SCREENSAVER)
#include <X11/extensions/saver.h>
extern Bool noScreenSaverExtension;
extern void ScreenSaverExtensionInit(void);
......
......@@ -397,6 +397,9 @@ static ExtensionModule staticExtensions[] = {
#ifdef DAMAGE
{DamageExtensionInit, "DAMAGE", &noDamageExtension, NULL},
#endif
#ifdef SCREENSAVER
{ScreenSaverExtensionInit, ScreenSaverName, &noScreenSaverExtension, NULL},
#endif
#ifdef DBE
{DbeExtensionInit, "DOUBLE-BUFFER", &noDbeExtension, NULL},
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment