--- a/make/project.xml Sun May 23 09:44:43 2021 +0200 +++ b/make/project.xml Sat Jan 04 16:38:48 2025 +0100 @@ -1,12 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<project> - <!-- - <dependency name="gtk4"> - <pkgconfig>gtk+-4.0</pkgconfig> - <cflags>-DUI_GTK3</cflags> +<project version="0.3" xmlns="http://unixwork.de/uwproj"> + <dependency> + <lang>c</lang> + </dependency> + + <dependency name="libadwaita"> + <pkgconfig>libadwaita-1</pkgconfig> + <cflags>-DUI_GTK4 -DUI_LIBADWAITA</cflags> <ldflags>-lpthread</ldflags> </dependency> - --> + <dependency name="gtk4"> + <pkgconfig>gtk4</pkgconfig> + <cflags>-DUI_GTK4</cflags> + <ldflags>-lpthread</ldflags> + </dependency> <dependency name="gtk3"> <pkgconfig>gtk+-3.0</pkgconfig> <cflags>-DUI_GTK3</cflags> @@ -23,50 +30,66 @@ <cflags>-DUI_GTK2 -DUI_GTK2LEGACY</cflags> <ldflags>-lpthread</ldflags> </dependency> - <dependency name="wpf" platform="windows"> - <cflags>-DUI_WPF</cflags> + <dependency name="winui" platform="windows"> + <cflags>-DUI_WINUI</cflags> </dependency> + <!-- <dependency name="qt4"> <test>which qmake-qt4</test> - <cflags type="exec">qmake-qt4 -o - /dev/null | grep DEFINES\ </cflags> - <cflags type="exec">qmake-qt4 -o - /dev/null | grep INCPATH\ </cflags> - <ldflags type="exec"><cflags type="exec">qmake-qt4 -o - /dev/null | grep LIBS\ </cflags></ldflags> + <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> <dependency name="qt5"> <test>which qmake-qt5</test> - <cflags type="exec">qmake-qt5 -o - /dev/null | grep DEFINES\ </cflags> - <cflags type="exec">qmake-qt5 -o - /dev/null | grep INCPATH\ </cflags> - <ldflags type="exec"><cflags type="exec">qmake-qt5 -o - /dev/null | grep LIBS\ </cflags></ldflags> + <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> </dependency> + --> <dependency name="cocoa" platform="macos"> <cflags>-DUI_COCOA</cflags> <ldflags>-lobjc -framework Cocoa</ldflags> </dependency> + + <dependency name="motif" platform="bsd"> + <cflags>-DUI_MOTIF -I/usr/local/include/X11</cflags> + <ldflags>-lXm -lXt -lX11 -lpthread</ldflags> + </dependency> + <dependency name="motif"> <cflags>-DUI_MOTIF</cflags> <ldflags>-lXm -lXt -lX11 -lpthread</ldflags> </dependency> <dependency platform="macos"> - <make>OBJ_EXT = o</make> - <make>LIB_EXT = a</make> + <make>OBJ_EXT = .o</make> + <make>LIB_EXT = .a</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>OBJ_EXT = .o</make> + <make>LIB_EXT = .a</make> <make>PACKAGE_SCRIPT = package_unix.sh</make> </dependency> + <dependency platform="bsd"> + <cflags>-I/usr/local/include</cflags> + <ldflags>-L/usr/local/lib</ldflags> + </dependency> + <target name="tk"> <option arg="toolkit"> - <!-- + <value str="libadwaita"> + <dependencies>libadwaita</dependencies> + <make>TOOLKIT = gtk</make> + <make>GTKOBJ = draw_cairo.o</make> + </value> <value str="gtk4"> <dependencies>gtk4</dependencies> <make>TOOLKIT = gtk</make> <make>GTKOBJ = draw_cairo.o</make> </value> - --> <value str="gtk3"> <dependencies>gtk3</dependencies> <make>TOOLKIT = gtk</make> @@ -92,14 +115,19 @@ <make>TOOLKIT = qt</make> <make>LD = $(CXX)</make> </value> + <value str="cocoa"> + <dependencies>cocoa</dependencies> + <make>TOOLKIT = cocoa</make> + </value> <value str="motif"> <dependencies>motif</dependencies> <make>TOOLKIT = motif</make> </value> - <default value="wpf" platform="windows" /> + <default value="winui" platform="windows" /> <default value="cocoa" platform="macos" /> + <default value="gtk4" /> <default value="gtk3" /> - <default value="qt5" /> + <!--<default value="qt5" />--> <default value="gtk2" /> <default value="qt4" /> <default value="motif" />