From abfe1f85b94e3286bf927f1bcb5af08264a287da Mon Sep 17 00:00:00 2001
From: Felix Kauselmann <2039670+selmf@users.noreply.github.com>
Date: Tue, 17 Feb 2015 18:06:53 +0100
Subject: [PATCH] add no_opengl config support to YACReader

---
 YACReader/YACReader.pri                     | 30 ++++++++++++++-------
 YACReader/YACReader.pro                     |  7 ++++-
 custom_widgets/custom_widgets_yacreader.pri |  8 ++++--
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/YACReader/YACReader.pri b/YACReader/YACReader.pri
index 56627b50..a6636953 100644
--- a/YACReader/YACReader.pri
+++ b/YACReader/YACReader.pri
@@ -32,7 +32,11 @@ INCLUDEPATH  += /usr/include/poppler/qt4
 LIBS         += -L/usr/lib -lpoppler-qt4
 
 }
-LIBS	     += -lGLU
+
+!CONFIG(no_opengl) {
+	LIBS += -lGLU
+}
+
 }
 
 macx{
@@ -53,12 +57,14 @@ LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
 
 OBJECTIVE_SOURCES += $$PWD/../common/pdf_comic.mm
 HEADERS += $$PWD/../common/pdf_comic.h
-
-
 }
 
 QT += network widgets core
-#opengl
+!CONFIG(no_opengl) {
+	QT += opengl
+}
+
+
 #CONFIG += release
 CONFIG -= flat
 
@@ -82,7 +88,6 @@ HEADERS += $$PWD/../common/comic.h \
     $$PWD/render.h \
     $$PWD/shortcuts_dialog.h \
 	$$PWD/translator.h \
-	#$$PWD/goto_flow_gl.h \
 	$$PWD/goto_flow_widget.h \
 	$$PWD/page_label_widget.h \
 	$$PWD/goto_flow_toolbar.h \
@@ -93,7 +98,6 @@ HEADERS += $$PWD/../common/comic.h \
     $$PWD/../common/custom_widgets.h \
     $$PWD/../common/check_new_version.h \
 	$$PWD/../common/qnaturalsorting.h \
-	#$$PWD/../common/yacreader_flow_gl.h \
 	$$PWD/../common/yacreader_global.h \
 	$$PWD/../common/onstart_flow_selection_dialog.h \
 	$$PWD/../common/comic_db.h \
@@ -103,7 +107,12 @@ HEADERS += $$PWD/../common/comic.h \
 	$$PWD/../common/http_worker.h \
 	$$PWD/../common/exit_check.h \
         $$PWD/../common/scroll_management.h
-	
+
+!CONFIG(no_opengl) {
+	HEADERS += 	$$PWD/goto_flow_gl.h \
+				$$PWD/../common/yacreader_flow_gl.h
+}
+
 SOURCES += $$PWD/../common/comic.cpp \
     $$PWD/configuration.cpp \
     $$PWD/goto_dialog.cpp \
@@ -117,7 +126,6 @@ SOURCES += $$PWD/../common/comic.cpp \
     $$PWD/render.cpp \
     $$PWD/shortcuts_dialog.cpp \
 	$$PWD/translator.cpp \
-	#$$PWD/goto_flow_gl.cpp \
 	$$PWD/goto_flow_widget.cpp \
 	$$PWD/page_label_widget.cpp \
 	$$PWD/goto_flow_toolbar.cpp \
@@ -128,7 +136,6 @@ SOURCES += $$PWD/../common/comic.cpp \
     $$PWD/../common/custom_widgets.cpp \
     $$PWD/../common/check_new_version.cpp \
 	$$PWD/../common/qnaturalsorting.cpp \
-	#$$PWD/../common/yacreader_flow_gl.cpp \
 	$$PWD/../common/onstart_flow_selection_dialog.cpp \
 	$$PWD/../common/comic_db.cpp \
 	$$PWD/../common/folder.cpp \
@@ -139,6 +146,11 @@ SOURCES += $$PWD/../common/comic.cpp \
 	$$PWD/../common/exit_check.cpp \
     $$PWD/../common/scroll_management.cpp
 
+!CONFIG(no_opengl) {
+	SOURCES += 	$$PWD/goto_flow_gl.cpp \
+				$$PWD/../common/yacreader_flow_gl.cpp
+}
+
 include($$PWD/../custom_widgets/custom_widgets_yacreader.pri)
 include($$PWD/../compressed_archive/wrapper.pri)
 include($$PWD/../shortcuts_management/shortcuts_management.pri)
diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index 7eca55a3..624c58b3 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -6,7 +6,12 @@ TARGET = YACReader
 DEPENDPATH += . \
     release
 
-DEFINES += NOMINMAX YACREADER NO_OPENGL
+DEFINES += NOMINMAX YACREADER
+
+CONFIG(no_opengl) {
+	DEFINES += NO_OPENGL
+}
+
 
  unix:!macx{
 QMAKE_CXXFLAGS += -std=c++11
diff --git a/custom_widgets/custom_widgets_yacreader.pri b/custom_widgets/custom_widgets_yacreader.pri
index 405776d1..fcadc933 100644
--- a/custom_widgets/custom_widgets_yacreader.pri
+++ b/custom_widgets/custom_widgets_yacreader.pri
@@ -6,11 +6,13 @@ HEADERS += $$PWD/help_about_dialog.h \
                         $$PWD/yacreader_field_plain_text_edit.h \
                         $$PWD/yacreader_flow.h \
                         $$PWD/yacreader_flow_config_widget.h \
-                        #$$PWD/yacreader_gl_flow_config_widget.h \
                         $$PWD/yacreader_options_dialog.h \
                         $$PWD/yacreader_spin_slider_widget.h \
                         $$PWD/yacreader_tool_bar_stretch.h \
                                                 $$PWD/yacreader_busy_widget.h
+!CONFIG(no_opengl) {
+	HEADERS += $$PWD/yacreader_gl_flow_config_widget.h
+}
 
 macx{
 HEADERS += $$PWD/yacreader_macosx_toolbar.h
@@ -23,11 +25,13 @@ SOURCES += $$PWD/help_about_dialog.cpp \
                          $$PWD/yacreader_field_plain_text_edit.cpp \
                          $$PWD/yacreader_flow.cpp \
                          $$PWD/yacreader_flow_config_widget.cpp \
-                         #$$PWD/yacreader_gl_flow_config_widget.cpp \
                          $$PWD/yacreader_options_dialog.cpp \
                          $$PWD/yacreader_spin_slider_widget.cpp \
                          $$PWD/yacreader_tool_bar_stretch.cpp \
 						$$PWD/yacreader_busy_widget.cpp
+!CONFIG(no_opengl) {
+	SOURCES += $$PWD/yacreader_gl_flow_config_widget.cpp
+}
 macx{
 OBJECTIVE_SOURCES += $$PWD/yacreader_macosx_toolbar.mm
 }