Mercurial > hg > toolkit / changeset

--- a/.hgignore	Tue Mar 25 14:04:43 2025 +0100
+++ b/.hgignore	Wed Mar 26 20:23:07 2025 +0100
@@ -7,4 +7,5 @@
 relre:^make/xcode/toolkit/toolkit.xcodeproj/xcuserdata/.*
 relre:^make/xcode/toolkit/toolkit.xcodeproj/project.xcworkspace/xcuserdata/.*
 relre:^ui/winui/Generated Files/.*
+relre:^.qmake.stash$
 relre:^.idea/.*

--- a/application/Makefile	Tue Mar 25 14:04:43 2025 +0100
+++ b/application/Makefile	Wed Mar 26 20:23:07 2025 +0100
@@ -38,7 +38,7 @@
 all: ../build/bin/mk12
 
 ../build/bin/mk12: $(OBJ) $(BUILD_ROOT)/build/lib/$(LIB_PREFIX)uitk$(LIB_EXT)
-	$(CC) -o ../build/bin/mk12$(APP_EXT) $(OBJ) -L$(BUILD_ROOT)/build/lib -luitk -lucx $(LDFLAGS) $(TK_LDFLAGS)
+	$(LD) -o ../build/bin/mk12$(APP_EXT) $(OBJ) -L$(BUILD_ROOT)/build/lib -luitk -lucx $(LDFLAGS) $(TK_LDFLAGS)
 
 ../build/application/%$(OBJ_EXT): %.c
 	$(CC) $(CFLAGS) $(TK_CFLAGS) -o $@ -c $<

--- a/configure	Tue Mar 25 14:04:43 2025 +0100
+++ b/configure	Wed Mar 26 20:23:07 2025 +0100
@@ -245,6 +245,9 @@
 # check languages
 lang_c=
 lang_cpp=
+if detect_cpp_compiler ; then
+    lang_cpp=1
+fi
 if detect_c_compiler ; then
     lang_c=1
 fi
@@ -299,6 +302,45 @@
     dep_checked_gtk2legacy=1
     return 0
 }
+dependency_error_qt5()
+{
+    print_check_msg "$dep_checked_qt5" "checking for qt5... "
+    # dependency qt5
+    while true
+    do
+        if [ -z "$lang_cpp" ] ; then
+            break
+        fi
+        if which qmake-qt5 > /dev/null ; then
+            :
+        else
+            break
+        fi
+        TEMP_CFLAGS="$TEMP_CFLAGS -DUI_QT5"
+        if tmp_flags=`qmake-qt5 -o - /dev/null | grep "DEFINES " | sed "s/DEFINES[ ]*=//g"` ; then
+            TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags"
+        else
+            break
+        fi
+        if tmp_flags=`qmake-qt5 -o - /dev/null | grep "INCPATH " | sed "s/INCPATH[ ]*=//g"` ; then
+            TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags"
+        else
+            break
+        fi
+        if tmp_flags=`qmake-qt5 -o - /dev/null | grep "LIBS " | sed "s/LIBS[ ]*=//g"` ; then
+            TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags"
+        else
+            break
+        fi
+        print_check_msg "$dep_checked_qt5" "yes\n"
+        dep_checked_qt5=1
+        return 1
+    done
+
+    print_check_msg "$dep_checked_qt5" "no\n"
+    dep_checked_qt5=1
+    return 0
+}
 dependency_error_gtk2()
 {
     print_check_msg "$dep_checked_gtk2" "checking for gtk2... "
@@ -580,6 +622,9 @@
             break
         fi
 
+        cat >> "$TEMP_DIR/make.mk" << __EOF__
+LD = \$(CC)
+__EOF__
         break
     done
     break
@@ -748,7 +793,7 @@
     fi
     cat >> "$TEMP_DIR/make.mk" << __EOF__
 TOOLKIT = qt
-LD = $(CXX)
+LD = \$(CXX)
 __EOF__
     return 0
 }
@@ -763,7 +808,7 @@
     fi
     cat >> "$TEMP_DIR/make.mk" << __EOF__
 TOOLKIT = qt
-LD = $(CXX)
+LD = \$(CXX)
 __EOF__
     return 0
 }

--- a/make/project.xml	Tue Mar 25 14:04:43 2025 +0100
+++ b/make/project.xml	Wed Mar 26 20:23:07 2025 +0100
@@ -2,6 +2,7 @@
 <project version="0.3" xmlns="http://unixwork.de/uwproj">
 	<dependency>
 		<lang>c</lang>
+		<make>LD = \$(CC)</make>
 	</dependency>
 	
 	<dependency name="libadwaita">
@@ -40,13 +41,16 @@
 		<cflags exec="true">qmake-qt4 -o - /dev/null | grep INCPATH\ </cflags>
 		<ldflags exec="true">qmake-qt4 -o - /dev/null | grep LIBS\ </ldflags>
 	</dependency>
+	-->
 	<dependency name="qt5">
 		<test>which qmake-qt5</test>
-		<cflags exec="true">qmake-qt5 -o - /dev/null | grep DEFINES\ </cflags>
-		<cflags exec="true">qmake-qt5 -o - /dev/null | grep INCPATH\ </cflags>
-		<ldflags exec="true">qmake-qt5 -o - /dev/null | grep LIBS\ </ldflags>
+		<lang>cpp</lang>
+		<cflags>-DUI_QT5</cflags>
+		<cflags exec="true">qmake-qt5 -o - /dev/null | grep "DEFINES " | sed "s/DEFINES[ ]*=//g"</cflags>
+		<cflags exec="true">qmake-qt5 -o - /dev/null | grep "INCPATH " | sed "s/INCPATH[ ]*=//g"</cflags>
+		<ldflags exec="true">qmake-qt5 -o - /dev/null | grep "LIBS " | sed "s/LIBS[ ]*=//g"</ldflags>
 	</dependency>
-	-->
+	
 	<dependency name="cocoa" platform="macos">
 		<cflags>-DUI_COCOA</cflags>
 		<ldflags>-lobjc -framework Cocoa</ldflags>
@@ -133,12 +137,12 @@
 			<value str="qt5">
 				<dependencies>qt5</dependencies>
 				<make>TOOLKIT = qt</make>
-				<make>LD = $(CXX)</make>
+				<make>LD = \$(CXX)</make>
 			</value>
 			<value str="qt4">
 				<dependencies>qt4</dependencies>
 				<make>TOOLKIT = qt</make>
-				<make>LD = $(CXX)</make>
+				<make>LD = \$(CXX)</make>
 			</value>
 			<value str="cocoa">
 				<dependencies>cocoa</dependencies>

--- a/ui/ui/toolkit.h	Tue Mar 25 14:04:43 2025 +0100
+++ b/ui/ui/toolkit.h	Wed Mar 26 20:23:07 2025 +0100
@@ -30,6 +30,7 @@
 #define	UI_TOOLKIT_H
 
 #include <inttypes.h>
+#include <stdlib.h>
 
 #ifdef UI_COCOA
 
@@ -60,12 +61,6 @@
 #include <adwaita.h>
 #endif
 
-#elif UI_MOTIF
-
-#include <Xm/XmAll.h> 
-#define UIWIDGET Widget
-#define UIMENU   Widget
-
 #elif defined(UI_QT4) || defined(UI_QT5)
 #ifdef	__cplusplus
 #include <QApplication>
@@ -75,9 +70,16 @@
 #define UIMENU   QMenu*
 #else /* __cplusplus */
 #define UIWIDGET void*
+#define UIWINDOW void*
 #define UIMENU   void*
 #endif
 
+#elif UI_MOTIF
+
+#include <Xm/XmAll.h> 
+#define UIWIDGET Widget
+#define UIMENU   Widget
+
 
 #elif UI_WIN32