Mercurial > hg > idav / file diff

--- a/make/project.xml	Sat Apr 05 17:57:04 2025 +0200
+++ b/make/project.xml	Sun Jul 20 22:04:39 2025 +0200
@@ -2,6 +2,7 @@
 <project version="0.3" xmlns="http://unixwork.de/uwproj">
 	<dependency>
 		<lang>c</lang>
+		<make>LD = \$(CC)</make>
 	</dependency>
 	
 	<dependency name="curl" platform="macos">
@@ -16,6 +17,11 @@
 		<ldflags exec="true">curl-config --libs</ldflags>
 	</dependency>
 	
+	<dependency name="sqlite">
+		<pkgconfig>sqlite3</pkgconfig>
+		<cflags>-DDBU_SQLITE</cflags>
+	</dependency>
+	
 	<dependency name="libxml2" platform="windows">
 		<cflags exec="true">xml2-config --cflags</cflags>
 		<ldflags exec="true">xml2-config --libs</ldflags>
@@ -75,21 +81,34 @@
 		<cflags>-DUI_WINUI</cflags>
 	</dependency>
 	
-	<!--
-	<dependency name="qt4">
-		<test>which qmake-qt4</test>
-		<cflags exec="true">qmake-qt4 -o - /dev/null | grep DEFINES\ </cflags>
-		<cflags exec="true">qmake-qt4 -o - /dev/null | grep INCPATH\ </cflags>
-		<ldflags exec="true">qmake-qt4 -o - /dev/null | grep LIBS\ </ldflags>
+	<dependency name="webkitgtk6">
+		<pkgconfig>webkitgtk-6.0</pkgconfig>
+		<cflags>-DUI_WEBVIEW</cflags>
+	</dependency>
+	<dependency name="webkitgtk6">
+		<!-- webview unsupported -->
+	</dependency>
+	<dependency name="webkit2gtk4">
+		<pkgconfig>webkit2gtk-4.1</pkgconfig>
+		<cflags>-DUI_WEBVIEW</cflags>
+	</dependency>
+	<dependency name="webkit2gtk4">
+		<pkgconfig>webkit2gtk-4.0</pkgconfig>
+		<cflags>-DUI_WEBVIEW</cflags>
+	</dependency>
+	<dependency name="webkit2gtk4">
+		<!-- webview unsupported -->
 	</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>
+		<pkgconfig>Qt5Widgets</pkgconfig>
+		<make>QMAKE = qmake-qt5</make>
+		<make>QT_PRO_FILE = qt5.pro</make>
 	</dependency>
-	-->
+	
 	<dependency name="cocoa" platform="macos">
 		<cflags>-DUI_COCOA</cflags>
 		<ldflags>-lobjc -framework Cocoa</ldflags>
@@ -108,15 +127,21 @@
 	<dependency platform="macos">
 		<make>OBJ_EXT = .o</make>
 		<make>LIB_EXT = .a</make>
+		<make>SHLIB_EXT = .dylib</make>
 		<make>LIB_PREFIX = lib</make>
 		<make>PACKAGE_SCRIPT = package_osx.sh</make>
 	</dependency>
 	<dependency platform="unix" not="macos">
 		<make>OBJ_EXT = .o</make>
 		<make>LIB_EXT = .a</make>
+		<make>SHLIB_EXT = .so</make>
 		<make>LIB_PREFIX = lib</make>
 		<make>PACKAGE_SCRIPT = package_unix.sh</make>
 	</dependency>
+	<dependency>
+		<make>BUILD_BIN_DIR = bin</make>
+		<make>BUILD_LIB_DIR = lib</make>
+	</dependency>
 	
 	<dependency platform="bsd">
 		<cflags>-I/usr/local/include</cflags>
@@ -127,42 +152,43 @@
 		<dependencies>curl,libxml2,openssl</dependencies>
 	</target>
 	
+	<target name="dbu">
+		<dependencies>sqlite</dependencies>
+	</target>
+	
 	<target name="tk">
 		<option arg="toolkit">
 			<value str="libadwaita">
-				<dependencies>libadwaita</dependencies>
+				<dependencies>libadwaita,webkitgtk6</dependencies>
 				<make>TOOLKIT = gtk</make>
 				<make>GTKOBJ = draw_cairo.o</make>
+				<make>APP_PLATFORM_SRC = gtk-text.c</make>
+				<make>APP_PLATFORM_SRC += gtk-image.c</make>
 			</value>
 			<value str="gtk4">
-				<dependencies>gtk4</dependencies>
+				<dependencies>gtk4,webkitgtk6</dependencies>
 				<make>TOOLKIT = gtk</make>
 				<make>GTKOBJ = draw_cairo.o</make>
+				<make>APP_PLATFORM_SRC = gtk-text.c</make>
+				<make>APP_PLATFORM_SRC += gtk-image.c</make>
 			</value>
 			<value str="gtk3">
-				<dependencies>gtk3</dependencies>
+				<dependencies>gtk3,webkit2gtk4</dependencies>
 				<make>TOOLKIT = gtk</make>
 				<make>GTKOBJ = draw_cairo.o</make>
+				<make>GTKOBJ = draw_cairo.o</make>
+				<make>APP_PLATFORM_SRC = gtk-text.c</make>
+				<make>APP_PLATFORM_SRC += gtk-image.c</make>
 			</value>
-			<value str="gtk2">
-				<dependencies>gtk2</dependencies>
-				<make>TOOLKIT = gtk</make>
-				<make>GTKOBJ = draw_cairo.o</make>
-			</value>
-			<value str="gtk2legacy">
-				<dependencies>gtk2legacy</dependencies>
-				<make>TOOLKIT = gtk</make>
-				<make>GTKOBJ = draw_gdk.o</make>
+			<value str="cocoa">
+				<dependencies>cocoa</dependencies>
+				<make>TOOLKIT = cocoa</make>
+				<make>APP_PLATFORM_SRC = cocoa-text.m</make>
 			</value>
 			<value str="qt5">
 				<dependencies>qt5</dependencies>
 				<make>TOOLKIT = qt</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="motif">
 				<dependencies>motif</dependencies>
@@ -170,12 +196,15 @@
 			</value>
 			<default value="winui" platform="windows" />
 			<default value="cocoa" platform="macos" />
+			<default value="libadwaita" />
 			<default value="gtk4" />
 			<default value="gtk3" />
+			<default value="motif" />
+			<!--
 			<default value="qt5" />
 			<default value="gtk2" />
 			<default value="qt4" />
-			<default value="motif" />
+			-->
 		</option>
 	</target>
 </project>