mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2026-04-12 15:49:53 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove ANGLE support

Browse Source
This commit is contained in:
luisangelsm
2026-01-20 09:03:56 +01:00
committed by Luis Ángel San Martín
parent 22b283cc3d
commit 2ec2defc8c
6 changed files with 12 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
YACReader/YACReader.pro
View File

@ -12,22 +12,12 @@ DEFINES += YACREADER
include (../config.pri) include (../config.pri)
include (../dependencies/pdf_backend.pri) include (../dependencies/pdf_backend.pri)
CONFIG(force_angle) { contains(QMAKE_TARGET.arch, x86_64) {
contains(QMAKE_TARGET.arch, x86_64) { Release:DESTDIR = ../release64
Release:DESTDIR = ../release64_angle Debug:DESTDIR = ../debug64
Debug:DESTDIR = ../debug64_angle
} else {
Release:DESTDIR = ../release_angle
Debug:DESTDIR = ../debug_angle
}
} else { } else {
contains(QMAKE_TARGET.arch, x86_64) { Release:DESTDIR = ../release
Release:DESTDIR = ../release64 Debug:DESTDIR = ../debug
Debug:DESTDIR = ../debug64
} else {
Release:DESTDIR = ../release
Debug:DESTDIR = ../debug
}
} }
SOURCES += main.cpp SOURCES += main.cpp
@ -39,18 +29,8 @@ INCLUDEPATH += ../common \
INCLUDEPATH += ../common/gl INCLUDEPATH += ../common/gl
} }
#there are going to be two builds for windows, OpenGL based and ANGLE based
win32 { win32 {
CONFIG(force_angle) { LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -luser32
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
}
msvc { msvc {
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL

4
YACReader/main.cpp
View File

@ -112,10 +112,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv); QApplication app(argc, argv);
#endif #endif
#ifdef FORCE_ANGLE
app.setAttribute(Qt::AA_UseOpenGLES);
#endif
app.setApplicationName("YACReader"); app.setApplicationName("YACReader");
app.setOrganizationName("YACReader"); app.setOrganizationName("YACReader");

32
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -20,18 +20,8 @@ include (../dependencies/pdf_backend.pri)
INCLUDEPATH += ../common/gl INCLUDEPATH += ../common/gl
# there are two builds for Windows, Desktop OpenGL based and ANGLE OpenGL ES based
win32 { win32 {
CONFIG(force_angle) { LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -luser32
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
}
msvc { msvc {
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
@ -40,22 +30,12 @@ win32 {
CONFIG -= embed_manifest_exe CONFIG -= embed_manifest_exe
} }
CONFIG(force_angle) { contains(QMAKE_TARGET.arch, x86_64) {
contains(QMAKE_TARGET.arch, x86_64) { Release:DESTDIR = ../release64
Release:DESTDIR = ../release64_angle Debug:DESTDIR = ../debug64
Debug:DESTDIR = ../debug64_angle
} else {
Release:DESTDIR = ../release_angle
Debug:DESTDIR = ../debug_angle
}
} else { } else {
contains(QMAKE_TARGET.arch, x86_64) { Release:DESTDIR = ../release
Release:DESTDIR = ../release64 Debug:DESTDIR = ../debug
Debug:DESTDIR = ../debug64
} else {
Release:DESTDIR = ../release
Debug:DESTDIR = ../debug
}
} }
macx { macx {

1
YACReaderLibrary/classic_comics_view.cpp
View File

@ -19,7 +19,6 @@ ClassicComicsView::ClassicComicsView(QWidget *parent)
settings->beginGroup("libraryConfig"); settings->beginGroup("libraryConfig");
// FLOW----------------------------------------------------------------------- // FLOW-----------------------------------------------------------------------
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// FORCE_ANGLE is not used here, because ComicFlowWidgetGL will use OpenGL ES in the future
#ifndef NO_OPENGL #ifndef NO_OPENGL
if ((settings->value(USE_OPEN_GL).toBool() == true)) if ((settings->value(USE_OPEN_GL).toBool() == true))
comicFlow = new ComicFlowWidgetGL(0); comicFlow = new ComicFlowWidgetGL(0);

4
YACReaderLibrary/main.cpp
View File

@ -146,10 +146,6 @@ int main(int argc, char **argv)
QApplication app(argc, argv); QApplication app(argc, argv);
#ifdef FORCE_ANGLE
app.setAttribute(Qt::AA_UseOpenGLES);
#endif
app.setApplicationName("YACReaderLibrary"); app.setApplicationName("YACReaderLibrary");
app.setOrganizationName("YACReader"); app.setOrganizationName("YACReader");
app.setApplicationVersion(VERSION); app.setApplicationVersion(VERSION);

3
custom_widgets/yacreader_options_dialog.cpp
View File

@ -45,9 +45,6 @@ YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget *parent)
#ifndef NO_OPENGL #ifndef NO_OPENGL
useGL = new QCheckBox(tr("Use hardware acceleration (restart needed)")); useGL = new QCheckBox(tr("Use hardware acceleration (restart needed)"));
connect(useGL, &QCheckBox::stateChanged, this, &YACReaderOptionsDialog::saveUseGL); connect(useGL, &QCheckBox::stateChanged, this, &YACReaderOptionsDialog::saveUseGL);
#endif
#ifdef FORCE_ANGLE
useGL->setHidden(true);
#endif #endif
// sw CONNECTIONS // sw CONNECTIONS
connect(sw->radio1, &QAbstractButton::toggled, this, &YACReaderOptionsDialog::setClassicConfigSW); connect(sw->radio1, &QAbstractButton::toggled, this, &YACReaderOptionsDialog::setClassicConfigSW);