typo fix

[pykit.git] / pykit.pro

diff --git a/pykit.pro b/pykit.pro
index ea387ff..e204b7c 100644 (file)
--- a/pykit.pro
+++ b/pykit.pro
@@ -1,10 +1,17 @@
 # CONFIG += no_poppler
-CONFIG += console
+# CONFIG += no_webkit
+# CONFIG += console
+CONFIG += windows
 TEMPLATE = app
 TARGET = pykit
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += webkit network gui core
+QT += network gui core svg
+
+# Used to manually link against latest webkit
+!no_webkit {
+    QT += webkit
+}
 
 isEmpty(PYTHON) {
     PYTHON = python
@@ -25,16 +32,18 @@ isEmpty(LIBPYTHON) {
     QMAKE_CXXFLAGS += $$system($$PYTHONCONFIG --cflags)
     QMAKE_CXXFLAGS -= -Wstrict-prototypes
     LIBS += $$system($$PYTHONCONFIG --ldflags)
+    # OUCH ... on Mac we sometimes have multiple python versions (in this case MacPorts and native)
+    # We need to explicitly specify the path as to link against the correct Version
+    LIBS -= $$system($$PYTHONCONFIG --libs | sed -e "'s/.*\\\\(-lpython[0-9.]*\\\\\).*/\\\\1/'")
+    LIBS += $$system(ls `$$PYTHONCONFIG --ldflags | sed -e "'s/.*-L\\\\([^ ]*\\\\).*/\\\\1/'"`/lib`$$PYTHONCONFIG --libs  | sed -e "'s/.*-l\\\\(python[0-9.]*\\\\).*/\\\\1/'"`* | tail -1)
 }
 else {
     LIBS += -l$$LIBPYTHON
 }
 
 mac {
-    # Qt is not available as univeral library and provides
-    # a correct -arch tag automatically
+    QMAKE_CXXFLAGS += -mmacosx-version-min=10.4
     QMAKE_CXXFLAGS -= -arch ppc x86_64 i386
-    QMAKE_CFLAGS -= -arch ppc x86_64 i386
 }
 
 win32 {
@@ -45,11 +54,13 @@ win32 {
 HEADERS += MainWindow.hh \
            Publisher.hh \
            PythonPublisher.hh \
+           PythonHTTP.hh \
            Viewer.hh
 SOURCES += main.cc \
            MainWindow.cc \
            Publisher.cc \
            PythonPublisher.cc \
+           PythonHTTP.cc \
            Viewer.cc
 
 # poppler