summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-07 08:22:15 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-07 08:22:15 (GMT)
commiteca5d80455308f9314bd793dc54f432a0994ea99 (patch)
treebec49c56d8d89954a6c79f170adc2ef08e7e94bc
parentad0f3588a1afeba7425025012266910930be4d01 (diff)
downloadswift-contrib-eca5d80455308f9314bd793dc54f432a0994ea99.zip
swift-contrib-eca5d80455308f9314bd793dc54f432a0994ea99.tar.bz2
Call 'nmake' for UI/Qt from toplevel makefile on Windows.
-rw-r--r--UI/Qt/Makefile.inc16
1 files changed, 13 insertions, 3 deletions
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