Mercurial > hg > toolkit / file diff

--- 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>