# 
# 
# patch "guitone/guitone.pro"
#  from [e4ff029ae4f185ea4fd5fbbaea60c04c167c8d1b]
#    to [93ca723e7e38213ddaadf77e761e5369c43041e0]
# 
============================================================
--- guitone/guitone.pro	e4ff029ae4f185ea4fd5fbbaea60c04c167c8d1b
+++ guitone/guitone.pro	93ca723e7e38213ddaadf77e761e5369c43041e0
@@ -1,3 +1,7 @@
+#
+# Common configuration
+#
+
 TEMPLATE = app
 TARGET   = guitone
 CONFIG  += qt debug precompile_header
@@ -48,13 +52,6 @@ FORMS   += res/dialogs/switch_workspace.
            res/dialogs/preferences.ui \
            res/dialogs/ancestry_graph.ui \
            res/dialogs/KeyManagment.ui
-
-# -lstdc++: this is a workaround for a possible flaw in libqanava
-# otherwise "undefined symbols: vtable for qan::la::Random"
-# pops up during linkage
-LIBS	 = -lstdc++ -L../libs/qanava/build -lqanava_la -lqanava_can -lqanava_ui -lqanava_utl
-
-INCLUDEPATH  = ../libs/qanava/src
 UI_DIR       = src/view/dialogs
 OBJECTS_DIR  = tmp
 MOC_DIR      = tmp
@@ -68,6 +65,10 @@ macx | unix {
 	QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
 }
 
+#
+# MacOS X specific configuration
+#
+
 macx {
         # copy i18n resources into the final app bundle
         QMAKE_POST_LINK = cp -R res/osx/Resources bin/guitone.app/Contents
@@ -87,3 +88,23 @@ macx {
 	QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
 }
 
+#
+# libqanava configuration
+#
+
+# use the bundled libqanava by defauult
+MYQANAVADIR=$$(QANAVADIR)
+isEmpty(MYQANAVADIR) {
+    MYQANAVADIR="../libs/qanava"
+}
+macx | unix {
+    LIBS = -L$${MYQANAVADIR}/build \
+           -lqanava_la -lqanava_can -lqanava_ui -lqanava_utl
+    DEFINES += QANAVA_UNIX
+}
+win32:LIBS = $${MYQANAVADIR}/build/qanava_la.lib \
+             $${MYQANAVADIR}/build/qanava_can.lib \
+             $${MYQANAVADIR}/build/qanava_ui.lib \
+             $${MYQANAVADIR}/build/qanava_utl.lib
+INCLUDEPATH += $${MYQANAVADIR}/src
+QT += xml