Add mac specific configuration

diff --git a/.gitignore b/.gitignore
index 85f641b..6006c7c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ moc_*
 *.moc
 /pykit
 /Makefile.qmake
+/pykit.app/

diff --git a/Makefile b/Makefile
index 2ed7bae..6525bcf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ Makefile.qmake:
 FORCE: ;
 
 clean:
-       @$(MAKE) -f Makefile.qmake clean
-       rm -f pykit Makefile.qmake
+       @[ ! -f Makefile.qmake ] || $(MAKE) -f Makefile.qmake clean
+       rm -rf pykit Makefile.qmake pykit.app
 
 Makefile: ;
 

diff --git a/Viewer.cc b/Viewer.cc
index a67a092..e16ffec 100644 (file)
--- a/Viewer.cc
+++ b/Viewer.cc
@@ -13,7 +13,9 @@
 #include <iostream>
 #include <QWebPluginFactory>
 #include "Publisher.hh"
+#ifdef POPPLER
 #include "PDFWidget.hh"
+#endif
 
 //#include "Viewer.mpp"
 #define prefix_

diff --git a/pykit.pro b/pykit.pro
index 1cb9fb6..5fa09b1 100644 (file)
--- a/pykit.pro
+++ b/pykit.pro
@@ -12,6 +12,12 @@ LIBS += -lboost_python
 QMAKE_CXXFLAGS += $$system(python-config --cflags)
 QMAKE_CFFLAGS += $$system(python-config --cflags)
 LIBS += $$system(python-config --ldflags)
+mac {
+    # Qt is not available as univeral library and provides
+    # a correct -arch tag automatically
+    QMAKE_CXXFLAGS -= -arch ppc x86_64 i386
+    QMAKE_CFLAGS -= -arch ppc x86_64 i386
+}
 
 # Input
 HEADERS += MainWindow.hh \