diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index 06285a1f..31378ae9 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -1,5 +1,5 @@
 # #####################################################################
-# Automatically generated by qmake (2.01a) mié 8. oct 20:54:05 2008
+# Automatically generated by qmake (2.01a) mié 8. oct 20:54:05 2008
 # #####################################################################
 TEMPLATE = app
 TARGET = YACReader
@@ -21,7 +21,170 @@ Release:DESTDIR = ../release
 Debug:DESTDIR = ../debug
 
 SOURCES += main.cpp
-include(YACReader.pri)
+
+INCLUDEPATH += ../common \
+                            ../custom_widgets
+
+CONFIG(legacy_gl_widget) {
+    INCLUDEPATH += ../common/gl_legacy \
+} else {
+    INCLUDEPATH += ../common/gl \
+}
+
+win32 {
+LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32
+
+LIBS += -lpoppler-qt5
+INCLUDEPATH += ../dependencies/poppler/include/qt5
+
+QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT
+!CONFIG(no_opengl) {
+        QMAKE_CXXFLAGS_RELEASE += /GL
+}
+QMAKE_LFLAGS_RELEASE += /LTCG
+CONFIG -= embed_manifest_exe
+}
+
+unix:!macx{
+
+INCLUDEPATH  += /usr/include/poppler/qt5
+LIBS         += -L/usr/lib -lpoppler-qt5
+
+!CONFIG(no_opengl) {
+        LIBS += -lGLU
+}
+
+}
+
+macx{
+#INCLUDEPATH  += "/Volumes/Mac OS X Lion/usr/X11/include"
+#isEqual(QT_MAJOR_VERSION, 5) {
+#INCLUDEPATH  += /usr/local/include/poppler/qt5
+#LIBS         += -L/usr/local/lib -lpoppler-qt5
+#}
+#else {
+#INCLUDEPATH  += /usr/local/include/poppler/qt4
+#LIBS         += -L/usr/local/lib -lpoppler-qt4
+#}
+CONFIG += objective_c
+QT += macextras gui-private
+
+
+LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
+
+OBJECTIVE_SOURCES += ../common/pdf_comic.mm
+HEADERS += ../common/pdf_comic.h
+}
+
+QT += network widgets core
+!CONFIG(no_opengl) {
+        QT += opengl
+}
+
+#CONFIG += release
+CONFIG -= flat
+
+QT += multimedia
+
+# Input
+HEADERS += ../common/comic.h \
+    configuration.h \
+    goto_dialog.h \
+    magnifying_glass.h \
+        main_window_viewer.h \
+    viewer.h \
+    goto_flow.h \
+    options_dialog.h \
+    ../common/bookmarks.h \
+    bookmarks_dialog.h \
+    render.h \
+    shortcuts_dialog.h \
+        translator.h \
+        goto_flow_widget.h \
+        page_label_widget.h \
+        goto_flow_toolbar.h \
+        goto_flow_decorationbar.h \
+        width_slider.h \
+        notifications_label_widget.h \
+        ../common/pictureflow.h \
+    ../common/custom_widgets.h \
+    ../common/check_new_version.h \
+        ../common/qnaturalsorting.h \
+        ../common/yacreader_global.h \
+        ../common/onstart_flow_selection_dialog.h \
+        ../common/comic_db.h \
+        ../common/folder.h \
+        ../common/library_item.h \
+        yacreader_local_client.h \
+        ../common/http_worker.h \
+        ../common/exit_check.h \
+        ../common/scroll_management.h
+
+!CONFIG(no_opengl) {
+    CONFIG(legacy_gl_widget) {
+        message("using legacy YACReaderFlowGL (QGLWidget) header")
+        HEADERS += ../common/gl_legacy/yacreader_flow_gl.h
+    } else {
+        HEADERS += ../common/gl/yacreader_flow_gl.h
+    }
+    HEADERS += 	goto_flow_gl.h
+}
+
+SOURCES += ../common/comic.cpp \
+    configuration.cpp \
+    goto_dialog.cpp \
+        magnifying_glass.cpp \
+    main_window_viewer.cpp \
+    viewer.cpp \
+    goto_flow.cpp \
+    options_dialog.cpp \
+    ../common/bookmarks.cpp \
+    bookmarks_dialog.cpp \
+    render.cpp \
+    shortcuts_dialog.cpp \
+        translator.cpp \
+        goto_flow_widget.cpp \
+        page_label_widget.cpp \
+        goto_flow_toolbar.cpp \
+        goto_flow_decorationbar.cpp \
+        width_slider.cpp \
+        notifications_label_widget.cpp \
+    ../common/pictureflow.cpp \
+    ../common/custom_widgets.cpp \
+    ../common/check_new_version.cpp \
+        ../common/qnaturalsorting.cpp \
+        ../common/onstart_flow_selection_dialog.cpp \
+        ../common/comic_db.cpp \
+        ../common/folder.cpp \
+        ../common/library_item.cpp \
+        yacreader_local_client.cpp \
+    ../common/http_worker.cpp \
+    ../common/yacreader_global.cpp \
+        ../common/exit_check.cpp \
+    ../common/scroll_management.cpp
+
+!CONFIG(no_opengl) {
+    CONFIG(legacy_gl_widget) {
+        message("using legacy YACReaderFlowGL (QGLWidget) source code")
+        SOURCES += ../common/gl_legacy/yacreader_flow_gl.cpp
+    } else {
+        SOURCES += ../common/gl/yacreader_flow_gl.cpp
+    }
+    SOURCES += goto_flow_gl.cpp
+}
+
+include(../custom_widgets/custom_widgets_yacreader.pri)
+include(../compressed_archive/wrapper.pri)
+include(../shortcuts_management/shortcuts_management.pri)
+
+RESOURCES += yacreader_images.qrc \
+    yacreader_files.qrc
+
+win32:RESOURCES += yacreader_images_win.qrc
+unix:!macx:RESOURCES += yacreader_images_win.qrc
+macx:RESOURCES += yacreader_images_osx.qrc
+
+
 include(../QsLog/QsLog.pri)
 
 RC_FILE = icon.rc
@@ -90,7 +253,7 @@ icon.path = $$DATADIR/yacreader
 icon.files = ../images/icon.png
 
 desktop.path = $$DATADIR/applications
-desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/icon.png $$PWD/../YACReader.desktop
+desktop.extra = desktop-file-edit --set-icon=$$DATADIR/yacreader/icon.png ../YACReader.desktop
 desktop.files = ../YACReader.desktop
 
 #TODO: icons should be located at /usr/share/icons and have the same basename as their application