From 8dd1a0f44f537e55a5d1ef4cbb2523b8abd8c4e0 Mon Sep 17 00:00:00 2001 From: Bob Polis Date: Wed, 27 Nov 2024 12:18:52 +0100 Subject: [PATCH] Adapt to moved Color class Color moved from libscscreensaver to libscgui, because it's more generic than for just screensavers. This forced me to add a libscgui dependency to all plugins. --- modules/Default/Default.cpp | 1 + modules/Default/premake.make | 4 +++- modules/FadingRects/FadingRects.cpp | 1 + modules/FadingRects/premake.make | 4 +++- modules/Grid/Grid.cpp | 1 + modules/Grid/premake.make | 4 +++- modules/Huey/Huey.cpp | 1 + modules/Huey/premake.make | 4 +++- modules/Whirling/Whirling.cpp | 1 + modules/Whirling/premake.make | 4 +++- skeleton/premake.make | 4 +++- 11 files changed, 23 insertions(+), 6 deletions(-) diff --git a/modules/Default/Default.cpp b/modules/Default/Default.cpp index 5f37a70..e941eb4 100644 --- a/modules/Default/Default.cpp +++ b/modules/Default/Default.cpp @@ -1,4 +1,5 @@ #include "Default.hpp" +#include #include class Default : public ScreensaverPlugin { diff --git a/modules/Default/premake.make b/modules/Default/premake.make index ec5846f..1307317 100644 --- a/modules/Default/premake.make +++ b/modules/Default/premake.make @@ -1,4 +1,6 @@ -LDLIBS := -lcairo -lscscreensaver +LDLIBS := -lcairo -lscscreensaver -lscgui +LDLIBS += $(shell pkg-config sdl2 --libs) +CXXFLAGS += $(shell pkg-config sdl2 --cflags) UNAME_S := $(shell uname -s) PROJ := $(shell basename $$(pwd)) PLUGIN := $(PROJ).saver diff --git a/modules/FadingRects/FadingRects.cpp b/modules/FadingRects/FadingRects.cpp index 160a3f0..0867afd 100644 --- a/modules/FadingRects/FadingRects.cpp +++ b/modules/FadingRects/FadingRects.cpp @@ -1,5 +1,6 @@ #include "FadingRects.hpp" #include +#include #include #include #include diff --git a/modules/FadingRects/premake.make b/modules/FadingRects/premake.make index 36e4b85..376a780 100644 --- a/modules/FadingRects/premake.make +++ b/modules/FadingRects/premake.make @@ -1,4 +1,6 @@ -LDLIBS := -lcairo -lscscreensaver -lscnumerics +LDLIBS := -lcairo -lscscreensaver -lscnumerics -lscgui +LDLIBS += $(shell pkg-config sdl2 --libs) +CXXFLAGS += $(shell pkg-config sdl2 --cflags) UNAME_S := $(shell uname -s) PROJ := $(shell basename $$(pwd)) PLUGIN := $(PROJ).saver diff --git a/modules/Grid/Grid.cpp b/modules/Grid/Grid.cpp index 1d4a59f..73bb9d1 100644 --- a/modules/Grid/Grid.cpp +++ b/modules/Grid/Grid.cpp @@ -1,4 +1,5 @@ #include "Grid.hpp" +#include #include #include #include diff --git a/modules/Grid/premake.make b/modules/Grid/premake.make index 33ab926..0efb04d 100644 --- a/modules/Grid/premake.make +++ b/modules/Grid/premake.make @@ -1,4 +1,6 @@ -LDLIBS := -lcairo -lscscreensaver -lscnumerics +LDLIBS := -lcairo -lscscreensaver -lscnumerics -lscgui +LDLIBS += $(shell pkg-config sdl2 --libs) +CXXFLAGS += $(shell pkg-config sdl2 --cflags) UNAME_S := $(shell uname -s) PROJ := $(shell basename $$(pwd)) PLUGIN := $(PROJ).saver diff --git a/modules/Huey/Huey.cpp b/modules/Huey/Huey.cpp index 4e19485..76a0bb6 100644 --- a/modules/Huey/Huey.cpp +++ b/modules/Huey/Huey.cpp @@ -1,4 +1,5 @@ #include "Huey.hpp" +#include #include #include #include diff --git a/modules/Huey/premake.make b/modules/Huey/premake.make index ec5846f..1307317 100644 --- a/modules/Huey/premake.make +++ b/modules/Huey/premake.make @@ -1,4 +1,6 @@ -LDLIBS := -lcairo -lscscreensaver +LDLIBS := -lcairo -lscscreensaver -lscgui +LDLIBS += $(shell pkg-config sdl2 --libs) +CXXFLAGS += $(shell pkg-config sdl2 --cflags) UNAME_S := $(shell uname -s) PROJ := $(shell basename $$(pwd)) PLUGIN := $(PROJ).saver diff --git a/modules/Whirling/Whirling.cpp b/modules/Whirling/Whirling.cpp index b9dfbb7..528677a 100644 --- a/modules/Whirling/Whirling.cpp +++ b/modules/Whirling/Whirling.cpp @@ -1,4 +1,5 @@ #include "Whirling.hpp" +#include #include #include #include diff --git a/modules/Whirling/premake.make b/modules/Whirling/premake.make index 24b9222..10ee47a 100644 --- a/modules/Whirling/premake.make +++ b/modules/Whirling/premake.make @@ -1,4 +1,6 @@ -LDLIBS := -lcairo -lscscreensaver +LDLIBS := -lcairo -lscscreensaver -lscgui +LDLIBS += $(shell pkg-config sdl2 --libs) +CXXFLAGS += $(shell pkg-config sdl2 --cflags) UNAME_S := $(shell uname -s) PROJ := $(shell basename $$(pwd)) PLUGIN := $(PROJ).saver diff --git a/skeleton/premake.make b/skeleton/premake.make index ec5846f..1307317 100644 --- a/skeleton/premake.make +++ b/skeleton/premake.make @@ -1,4 +1,6 @@ -LDLIBS := -lcairo -lscscreensaver +LDLIBS := -lcairo -lscscreensaver -lscgui +LDLIBS += $(shell pkg-config sdl2 --libs) +CXXFLAGS += $(shell pkg-config sdl2 --cflags) UNAME_S := $(shell uname -s) PROJ := $(shell basename $$(pwd)) PLUGIN := $(PROJ).saver