diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro index d50940f8..3eb06c23 100644 --- a/YACReader/YACReader.pro +++ b/YACReader/YACReader.pro @@ -12,22 +12,12 @@ DEFINES += YACREADER include (../config.pri) include (../dependencies/pdf_backend.pri) -CONFIG(force_angle) { - contains(QMAKE_TARGET.arch, x86_64) { - Release:DESTDIR = ../release64_angle - Debug:DESTDIR = ../debug64_angle - } else { - Release:DESTDIR = ../release_angle - Debug:DESTDIR = ../debug_angle - } +contains(QMAKE_TARGET.arch, x86_64) { + Release:DESTDIR = ../release64 + Debug:DESTDIR = ../debug64 } else { - contains(QMAKE_TARGET.arch, x86_64) { - Release:DESTDIR = ../release64 - Debug:DESTDIR = ../debug64 - } else { - Release:DESTDIR = ../release - Debug:DESTDIR = ../debug - } + Release:DESTDIR = ../release + Debug:DESTDIR = ../debug } SOURCES += main.cpp @@ -39,18 +29,8 @@ INCLUDEPATH += ../common \ INCLUDEPATH += ../common/gl } -#there are going to be two builds for windows, OpenGL based and ANGLE based win32 { - CONFIG(force_angle) { - message("using ANGLE") - LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -luser32 - #linking extra libs are necesary for a successful compilation, a better approach should be - #to remove any OpenGL (desktop) dependencies - #the OpenGL stuff should be migrated to OpenGL ES - DEFINES += FORCE_ANGLE - } else { - LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -luser32 - } + LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -luser32 msvc { QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL diff --git a/YACReader/main.cpp b/YACReader/main.cpp index 39bbf3eb..cc757ce7 100644 --- a/YACReader/main.cpp +++ b/YACReader/main.cpp @@ -112,10 +112,6 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); #endif -#ifdef FORCE_ANGLE - app.setAttribute(Qt::AA_UseOpenGLES); -#endif - app.setApplicationName("YACReader"); app.setOrganizationName("YACReader"); diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index 2330a782..4e552b40 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -20,18 +20,8 @@ include (../dependencies/pdf_backend.pri) INCLUDEPATH += ../common/gl -# there are two builds for Windows, Desktop OpenGL based and ANGLE OpenGL ES based win32 { - CONFIG(force_angle) { - message("using ANGLE") - LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -luser32 - # linking extra libs are necesary for a successful compilation, a better approach should be - # to remove any OpenGL (desktop) dependencies - # the OpenGL stuff should be migrated to OpenGL ES - DEFINES += FORCE_ANGLE - } else { - LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -luser32 - } + LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -luser32 msvc { QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL @@ -40,22 +30,12 @@ win32 { CONFIG -= embed_manifest_exe } -CONFIG(force_angle) { - contains(QMAKE_TARGET.arch, x86_64) { - Release:DESTDIR = ../release64_angle - Debug:DESTDIR = ../debug64_angle - } else { - Release:DESTDIR = ../release_angle - Debug:DESTDIR = ../debug_angle - } +contains(QMAKE_TARGET.arch, x86_64) { + Release:DESTDIR = ../release64 + Debug:DESTDIR = ../debug64 } else { - contains(QMAKE_TARGET.arch, x86_64) { - Release:DESTDIR = ../release64 - Debug:DESTDIR = ../debug64 - } else { - Release:DESTDIR = ../release - Debug:DESTDIR = ../debug - } + Release:DESTDIR = ../release + Debug:DESTDIR = ../debug } macx { diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp index 66b602b9..9368779d 100644 --- a/YACReaderLibrary/classic_comics_view.cpp +++ b/YACReaderLibrary/classic_comics_view.cpp @@ -19,7 +19,6 @@ ClassicComicsView::ClassicComicsView(QWidget *parent) settings->beginGroup("libraryConfig"); // FLOW----------------------------------------------------------------------- //--------------------------------------------------------------------------- -// FORCE_ANGLE is not used here, because ComicFlowWidgetGL will use OpenGL ES in the future #ifndef NO_OPENGL if ((settings->value(USE_OPEN_GL).toBool() == true)) comicFlow = new ComicFlowWidgetGL(0); diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp index 0af94d5f..5e703c2d 100644 --- a/YACReaderLibrary/main.cpp +++ b/YACReaderLibrary/main.cpp @@ -146,10 +146,6 @@ int main(int argc, char **argv) QApplication app(argc, argv); -#ifdef FORCE_ANGLE - app.setAttribute(Qt::AA_UseOpenGLES); -#endif - app.setApplicationName("YACReaderLibrary"); app.setOrganizationName("YACReader"); app.setApplicationVersion(VERSION); diff --git a/custom_widgets/yacreader_options_dialog.cpp b/custom_widgets/yacreader_options_dialog.cpp index 8f6de9a8..6f5178cc 100644 --- a/custom_widgets/yacreader_options_dialog.cpp +++ b/custom_widgets/yacreader_options_dialog.cpp @@ -45,9 +45,6 @@ YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget *parent) #ifndef NO_OPENGL useGL = new QCheckBox(tr("Use hardware acceleration (restart needed)")); connect(useGL, &QCheckBox::stateChanged, this, &YACReaderOptionsDialog::saveUseGL); -#endif -#ifdef FORCE_ANGLE - useGL->setHidden(true); #endif // sw CONNECTIONS connect(sw->radio1, &QAbstractButton::toggled, this, &YACReaderOptionsDialog::setClassicConfigSW);