From eca5d80455308f9314bd793dc54f432a0994ea99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 7 Jun 2009 10:22:15 +0200
Subject: Call 'nmake' for UI/Qt from toplevel makefile on Windows.


diff --git a/UI/Qt/Makefile.inc b/UI/Qt/Makefile.inc
index b4ac936..143f744 100644
--- a/UI/Qt/Makefile.inc
+++ b/UI/Qt/Makefile.inc
@@ -1,18 +1,28 @@
 TARGETS += qt
 CLEAN_TARGETS += clean-qt
 
+ifeq ($(WIN32),1)
+QT_MAKE=nmake
+else
+QT_MAKE=$(MAKE)
+endif
+
+
 .PHONY: qt
 qt: UI/Qt/Makefile
-	$(MAKE) -C UI/Qt
+	cd UI/Qt && $(QT_MAKE)
 
 .PHONY: clean-qt
 clean-qt:
 	if [ -f "UI/Qt/Makefile" ]; then \
-		$(MAKE) -C UI/Qt clean; \
+		cd UI/Qt && $(QT_MAKE) clean; \
 	fi
 
-UI/Qt/Makefile: UI/Qt/DefaultTheme.qrc
+UI/Qt/Makefile: UI/Qt/DefaultTheme.qrc UI/Qt/Swiften.pri
 	cd UI/Qt && $(QMAKE) Swift.pro
 
+UI/Qt/Swiften.pri:
+	cd UI/Qt && ./qmakeish.py ../../Makefile > Swiften.pri
+
 UI/Qt/DefaultTheme.qrc:
 	cd UI/Qt && ../../tools/ThemeQRC.py ../../resources/themes/Default > DefaultTheme.qrc
-- 
cgit v0.10.2-6-g49f6