diff --git a/srcvled/config.mak b/srcvled/config.mak index d072320..9daf3e8 100755 --- a/srcvled/config.mak +++ b/srcvled/config.mak @@ -129,4 +129,6 @@ ifneq ($(findstring MacOS, $(TEC_UNAME)), ) LIBS += fontconfig endif +LIBS += gmodule-2.0 + INCLUDES = ../src diff --git a/srcweb/config.mak b/srcweb/config.mak index c528f2c..4ff9689 100755 --- a/srcweb/config.mak +++ b/srcweb/config.mak @@ -35,15 +35,20 @@ else LINK_WEBKIT = Yes ifdef USE_GTK3 - ifneq ($(findstring Linux5, $(TEC_UNAME)), ) + ifneq ($(findstring Linux6, $(TEC_UNAME)), ) DEFINES += USE_WEBKIT2 STDINCS += $(GTK)/include/webkitgtk-4.0 else - ifneq ($(findstring Linux4, $(TEC_UNAME)), ) + ifneq ($(findstring Linux5, $(TEC_UNAME)), ) DEFINES += USE_WEBKIT2 STDINCS += $(GTK)/include/webkitgtk-4.0 else - STDINCS += $(GTK)/include/webkitgtk-3.0 + ifneq ($(findstring Linux4, $(TEC_UNAME)), ) + DEFINES += USE_WEBKIT2 + STDINCS += $(GTK)/include/webkitgtk-4.0 + else + STDINCS += $(GTK)/include/webkitgtk-3.0 + endif endif endif else diff --git a/tecmake.mak b/tecmake.mak index 48991a4..bafe31b 100755 --- a/tecmake.mak +++ b/tecmake.mak @@ -297,6 +297,9 @@ endif ifdef GTK_DEFAULT ifndef USE_GTK2 + ifneq ($(findstring Linux6, $(TEC_UNAME)), ) + USE_GTK3 = Yes + endif ifneq ($(findstring Linux5, $(TEC_UNAME)), ) USE_GTK3 = Yes endif @@ -1210,6 +1213,9 @@ ifdef USE_CD ifneq ($(findstring Linux5, $(TEC_UNAME)), ) LIBS += fontconfig endif + ifneq ($(findstring Linux6, $(TEC_UNAME)), ) + LIBS += fontconfig + endif ifneq ($(findstring cygw, $(TEC_UNAME)), ) LIBS += fontconfig endif @@ -1245,20 +1251,24 @@ ifdef USE_IM endif ifdef LINK_WEBKIT - ifneq ($(findstring Linux5, $(TEC_UNAME)), ) + ifneq ($(findstring Linux6, $(TEC_UNAME)), ) LIBS += webkit2gtk-4.0 gio-2.0 - else - ifneq ($(findstring Linux4, $(TEC_UNAME)), ) + else + ifneq ($(findstring Linux5, $(TEC_UNAME)), ) LIBS += webkit2gtk-4.0 gio-2.0 else - ifneq ($(findstring Linux3, $(TEC_UNAME)), ) - ifdef USE_GTK3 - LIBS += webkitgtk-3.0 + ifneq ($(findstring Linux4, $(TEC_UNAME)), ) + LIBS += webkit2gtk-4.0 gio-2.0 + else + ifneq ($(findstring Linux3, $(TEC_UNAME)), ) + ifdef USE_GTK3 + LIBS += webkitgtk-3.0 + else + LIBS += webkitgtk-1.0 + endif else - LIBS += webkitgtk-1.0 + LIBS += webkit-1.0 endif - else - LIBS += webkit-1.0 endif endif endif @@ -1479,6 +1489,9 @@ ifdef USE_GTK ifneq ($(findstring Linux5, $(TEC_UNAME)), ) STDINCS += /usr/include/harfbuzz endif + ifneq ($(findstring Linux6, $(TEC_UNAME)), ) + STDINCS += /usr/include/harfbuzz + endif endif endif