From bb9ff083b3b2ca72151b19e4d12a4adde00663f0 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Sat, 20 Jul 2024 18:09:50 -0400 Subject: [PATCH] GTK4: validate compilation with gtk3 --- config.h | 2 +- makefile | 4 ++-- rosenrot.c | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/config.h b/config.h index 83ebf23..3bddb4f 100644 --- a/config.h +++ b/config.h @@ -2,7 +2,7 @@ #include // , // GKG 3 or GKG 4 -# define GKG_NUM 4 +# define GKG_NUM 3 // Key user config #define WIDTH 1920 // 960 for half-width, 1920 for full width diff --git a/makefile b/makefile index 5bca339..990b016 100644 --- a/makefile +++ b/makefile @@ -7,8 +7,8 @@ DEBUG= # -g STD=-std=c99 # maybe consider moving to c11 and using safer string handling # Dependencies -# DEPS='webkit2gtk-4.1' -DEPS='webkitgtk-6.0' +DEPS='webkit2gtk-4.1' +# DEPS='webkitgtk-6.0' INCS=`pkg-config --cflags ${DEPS}` LIBS=`pkg-config --libs ${DEPS}` diff --git a/rosenrot.c b/rosenrot.c index ae9e043..501d595 100644 --- a/rosenrot.c +++ b/rosenrot.c @@ -2,14 +2,12 @@ #include #include +#include "config.h" #if GKG_NUM == 3 #include #elif GKG_NUM == 4 #include #endif - - -#include "config.h" #include "plugins/plugins.h" /* Global declarations */