Mercurial > hg > ascension / changeset

--- a/configure	Sun May 24 13:04:25 2026 +0200
+++ b/configure	Sun May 24 16:48:51 2026 +0200
@@ -336,32 +336,6 @@
     dep_checked_sdl3_ttf=1
     return 0
 }
-dependency_error_gtk3()
-{
-    print_check_msg "$dep_checked_gtk3" "checking for gtk3... "
-    # dependency gtk3
-    while true
-    do
-        if [ -z "$PKG_CONFIG" ]; then
-            break
-        fi
-        if test_pkg_config "gtk+-3.0" "" "" "" ; then
-            TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags gtk+-3.0`"
-            TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs gtk+-3.0`"
-        else
-            break
-        fi
-        TEMP_CFLAGS="$TEMP_CFLAGS -DUI_GTK3"
-        TEMP_LDFLAGS="$TEMP_LDFLAGS -lpthread"
-        print_check_msg "$dep_checked_gtk3" "yes\n"
-        dep_checked_gtk3=1
-        return 1
-    done
-
-    print_check_msg "$dep_checked_gtk3" "no\n"
-    dep_checked_gtk3=1
-    return 0
-}
 dependency_error_toolkit()
 {
     print_check_msg "$dep_checked_toolkit" "checking for toolkit... "
@@ -373,7 +347,7 @@
         else
             break
         fi
-        if test -f "$TOOLKIT_HOME/lib/libuitk.a" > /dev/null 2>&1 ; then
+        if test -f "$TOOLKIT_HOME/lib/libuitk.so" > /dev/null 2>&1 ; then
             :
         else
             break
@@ -384,7 +358,7 @@
             break
         fi
         TEMP_CFLAGS="$TEMP_CFLAGS -I$TOOLKIT_HOME/include"
-        TEMP_LDFLAGS="$TEMP_LDFLAGS $TOOLKIT_HOME/lib/libuitk.a"
+        TEMP_LDFLAGS="$TEMP_LDFLAGS -L $TOOLKIT_HOME/lib/ -luitk"
         print_check_msg "$dep_checked_toolkit" "yes\n"
         dep_checked_toolkit=1
         return 1
@@ -626,26 +600,6 @@
             ERROR=1
         fi
     fi
-    # check dependency
-    if dependency_error_gtk3 ; then
-        # "auto" features can fail and are just disabled in this case
-        if [ "$FEATURE_TOOLS" = "auto" ]; then
-            DISABLE_FEATURE_TOOLS=1
-        else
-            DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED gtk3 "
-            ERROR=1
-        fi
-    fi
-    # check dependency
-    if dependency_error_ucx ; then
-        # "auto" features can fail and are just disabled in this case
-        if [ "$FEATURE_TOOLS" = "auto" ]; then
-            DISABLE_FEATURE_TOOLS=1
-        else
-            DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ucx "
-            ERROR=1
-        fi
-    fi
     if [ -n "$DISABLE_FEATURE_TOOLS" ]; then
         unset FEATURE_TOOLS
     fi

--- a/make/project.xml	Sun May 24 13:04:25 2026 +0200
+++ b/make/project.xml	Sun May 24 16:48:51 2026 +0200
@@ -36,16 +36,10 @@
 
     <dependency name="toolkit">
         <test>test -n "$TOOLKIT_HOME"</test>
-        <test>test -f "$TOOLKIT_HOME/lib/libuitk.a"</test>
+        <test>test -f "$TOOLKIT_HOME/lib/libuitk.so"</test>
         <test>test -f "$TOOLKIT_HOME/include/ui/ui.h"</test>
         <cflags>-I$TOOLKIT_HOME/include</cflags>
-        <ldflags>$TOOLKIT_HOME/lib/libuitk.a</ldflags>
-    </dependency>
-
-    <dependency name="gtk3">
-        <pkgconfig>gtk+-3.0</pkgconfig>
-        <cflags>-DUI_GTK3</cflags>
-        <ldflags>-lpthread</ldflags>
+        <ldflags>-L $TOOLKIT_HOME/lib/ -luitk</ldflags>
     </dependency>
 
     <target>
@@ -61,7 +55,7 @@
             <disabled>
                 <make>NO_TOOLS=1</make>
             </disabled>
-            <dependencies>toolkit,gtk3,ucx</dependencies>
+            <dependencies>toolkit</dependencies>
         </feature>
     </target>
 </project>