From 4e79ba60ce17ad96f159a3fa6f38dc29e7a21218 Mon Sep 17 00:00:00 2001 From: Bob Polis Date: Fri, 29 Nov 2024 14:19:49 +0100 Subject: [PATCH] Move Color class from libscgui to libsccolor --- modules/Default/Default.cpp | 2 +- modules/Default/premake.make | 4 +--- modules/FadingRects/FadingRects.cpp | 2 +- modules/FadingRects/premake.make | 4 +--- modules/Grid/Grid.cpp | 2 +- modules/Grid/premake.make | 4 +--- modules/Huey/Huey.cpp | 2 +- modules/Huey/premake.make | 4 +--- modules/Whirling/Whirling.cpp | 2 +- modules/Whirling/premake.make | 4 +--- skeleton/premake.make | 4 +--- 11 files changed, 11 insertions(+), 23 deletions(-) diff --git a/modules/Default/Default.cpp b/modules/Default/Default.cpp index e941eb4..856e86e 100644 --- a/modules/Default/Default.cpp +++ b/modules/Default/Default.cpp @@ -1,5 +1,5 @@ #include "Default.hpp" -#include +#include #include class Default : public ScreensaverPlugin { diff --git a/modules/Default/premake.make b/modules/Default/premake.make index 1307317..fa8096c 100644 --- a/modules/Default/premake.make +++ b/modules/Default/premake.make @@ -1,6 +1,4 @@ -LDLIBS := -lcairo -lscscreensaver -lscgui -LDLIBS += $(shell pkg-config sdl2 --libs) -CXXFLAGS += $(shell pkg-config sdl2 --cflags) +LDLIBS := -lcairo -lscscreensaver -lsccolor 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 0867afd..558b7a9 100644 --- a/modules/FadingRects/FadingRects.cpp +++ b/modules/FadingRects/FadingRects.cpp @@ -1,6 +1,6 @@ #include "FadingRects.hpp" #include -#include +#include #include #include #include diff --git a/modules/FadingRects/premake.make b/modules/FadingRects/premake.make index 376a780..a7655b8 100644 --- a/modules/FadingRects/premake.make +++ b/modules/FadingRects/premake.make @@ -1,6 +1,4 @@ -LDLIBS := -lcairo -lscscreensaver -lscnumerics -lscgui -LDLIBS += $(shell pkg-config sdl2 --libs) -CXXFLAGS += $(shell pkg-config sdl2 --cflags) +LDLIBS := -lcairo -lscscreensaver -lscnumerics -lsccolor 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 73bb9d1..283686c 100644 --- a/modules/Grid/Grid.cpp +++ b/modules/Grid/Grid.cpp @@ -1,5 +1,5 @@ #include "Grid.hpp" -#include +#include #include #include #include diff --git a/modules/Grid/premake.make b/modules/Grid/premake.make index 0efb04d..faaee07 100644 --- a/modules/Grid/premake.make +++ b/modules/Grid/premake.make @@ -1,6 +1,4 @@ -LDLIBS := -lcairo -lscscreensaver -lscnumerics -lscgui -LDLIBS += $(shell pkg-config sdl2 --libs) -CXXFLAGS += $(shell pkg-config sdl2 --cflags) +LDLIBS := -lcairo -lscscreensaver -lscnumerics -lsccolor 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 76a0bb6..6dc8446 100644 --- a/modules/Huey/Huey.cpp +++ b/modules/Huey/Huey.cpp @@ -1,5 +1,5 @@ #include "Huey.hpp" -#include +#include #include #include #include diff --git a/modules/Huey/premake.make b/modules/Huey/premake.make index 1307317..fa8096c 100644 --- a/modules/Huey/premake.make +++ b/modules/Huey/premake.make @@ -1,6 +1,4 @@ -LDLIBS := -lcairo -lscscreensaver -lscgui -LDLIBS += $(shell pkg-config sdl2 --libs) -CXXFLAGS += $(shell pkg-config sdl2 --cflags) +LDLIBS := -lcairo -lscscreensaver -lsccolor 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 528677a..cc30ac8 100644 --- a/modules/Whirling/Whirling.cpp +++ b/modules/Whirling/Whirling.cpp @@ -1,5 +1,5 @@ #include "Whirling.hpp" -#include +#include #include #include #include diff --git a/modules/Whirling/premake.make b/modules/Whirling/premake.make index 10ee47a..e902370 100644 --- a/modules/Whirling/premake.make +++ b/modules/Whirling/premake.make @@ -1,6 +1,4 @@ -LDLIBS := -lcairo -lscscreensaver -lscgui -LDLIBS += $(shell pkg-config sdl2 --libs) -CXXFLAGS += $(shell pkg-config sdl2 --cflags) +LDLIBS := -lcairo -lscscreensaver -lsccolor UNAME_S := $(shell uname -s) PROJ := $(shell basename $$(pwd)) PLUGIN := $(PROJ).saver diff --git a/skeleton/premake.make b/skeleton/premake.make index 1307317..fa8096c 100644 --- a/skeleton/premake.make +++ b/skeleton/premake.make @@ -1,6 +1,4 @@ -LDLIBS := -lcairo -lscscreensaver -lscgui -LDLIBS += $(shell pkg-config sdl2 --libs) -CXXFLAGS += $(shell pkg-config sdl2 --cflags) +LDLIBS := -lcairo -lscscreensaver -lsccolor UNAME_S := $(shell uname -s) PROJ := $(shell basename $$(pwd)) PLUGIN := $(PROJ).saver