mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

add no_opengl config option to YACReaderLibrary

Browse Source
This commit is contained in:
Felix Kauselmann 2015-02-17 17:45:48 +01:00
parent 4db439511b
commit 20d278c301
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -13,7 +13,11 @@ INCLUDEPATH += ../common \
./comic_vine \ ./comic_vine \
./comic_vine/model ./comic_vine/model
DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY NO_OPENGL DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY
CONFIG(no_opengl) {
DEFINES += NO_OPENGL
}
win32 { win32 {
@ -43,8 +47,10 @@ else {
INCLUDEPATH += /usr/include/poppler/qt4 INCLUDEPATH += /usr/include/poppler/qt4
LIBS += -L/usr/lib -lpoppler-qt4 LIBS += -L/usr/lib -lpoppler-qt4
} }
!CONFIG(no_opengl) {
LIBS += -lGLU LIBS += -lGLU
} }
}
macx{ macx{
#INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include" #INCLUDEPATH += "/Volumes/Mac OS X Lion/usr/X11/include"
@ -73,7 +79,9 @@ QMAKE_CXXFLAGS += -std=c++11
#CONFIG += release #CONFIG += release
CONFIG -= flat CONFIG -= flat
QT += sql network widgets script QT += sql network widgets script
#opengl !CONFIG(no_opengl) {
QT += opengl
}
# Input # Input
HEADERS += comic_flow.h \ HEADERS += comic_flow.h \
@ -106,7 +114,6 @@ HEADERS += comic_flow.h \
../common/pictureflow.h \ ../common/pictureflow.h \
../common/custom_widgets.h \ ../common/custom_widgets.h \
../common/qnaturalsorting.h \ ../common/qnaturalsorting.h \
#../common/yacreader_flow_gl.h \
../common/yacreader_global.h \ ../common/yacreader_global.h \
../common/onstart_flow_selection_dialog.h \ ../common/onstart_flow_selection_dialog.h \
no_libraries_widget.h \ no_libraries_widget.h \
@ -135,6 +142,9 @@ HEADERS += comic_flow.h \
empty_reading_list_widget.h \ empty_reading_list_widget.h \
../common/scroll_management.h ../common/scroll_management.h
!CONFIG(no_opengl) {
HEADERS += ../common/yacreader_flow_gl.h
}
SOURCES += comic_flow.cpp \ SOURCES += comic_flow.cpp \
create_library_dialog.cpp \ create_library_dialog.cpp \
@ -167,7 +177,6 @@ SOURCES += comic_flow.cpp \
../common/pictureflow.cpp \ ../common/pictureflow.cpp \
../common/custom_widgets.cpp \ ../common/custom_widgets.cpp \
../common/qnaturalsorting.cpp \ ../common/qnaturalsorting.cpp \
#../common/yacreader_flow_gl.cpp \
../common/onstart_flow_selection_dialog.cpp \ ../common/onstart_flow_selection_dialog.cpp \
no_libraries_widget.cpp \ no_libraries_widget.cpp \
import_widget.cpp \ import_widget.cpp \
@ -196,6 +205,10 @@ SOURCES += comic_flow.cpp \
empty_reading_list_widget.cpp \ empty_reading_list_widget.cpp \
../common/scroll_management.cpp ../common/scroll_management.cpp
!CONFIG(no_opengl) {
SOURCES += ../common/yacreader_flow_gl.cpp
}
include(./server/server.pri) include(./server/server.pri)
include(../custom_widgets/custom_widgets_yacreaderlibrary.pri) include(../custom_widgets/custom_widgets_yacreaderlibrary.pri)

9
custom_widgets/custom_widgets_yacreaderlibrary.pri
View File

@ -6,7 +6,6 @@ HEADERS += $$PWD/help_about_dialog.h \
$$PWD/yacreader_field_plain_text_edit.h \ $$PWD/yacreader_field_plain_text_edit.h \
$$PWD/yacreader_flow.h \ $$PWD/yacreader_flow.h \
$$PWD/yacreader_flow_config_widget.h \ $$PWD/yacreader_flow_config_widget.h \
#$$PWD/yacreader_gl_flow_config_widget.h \
$$PWD/yacreader_options_dialog.h \ $$PWD/yacreader_options_dialog.h \
$$PWD/yacreader_search_line_edit.h \ $$PWD/yacreader_search_line_edit.h \
$$PWD/yacreader_spin_slider_widget.h \ $$PWD/yacreader_spin_slider_widget.h \
@ -19,6 +18,9 @@ HEADERS += $$PWD/help_about_dialog.h \
$$PWD/yacreader_library_item_widget.h \ $$PWD/yacreader_library_item_widget.h \
$$PWD/yacreader_treeview.h \ $$PWD/yacreader_treeview.h \
$$PWD/yacreader_busy_widget.h $$PWD/yacreader_busy_widget.h
!CONFIG(no_opengl){
HEADERS += $$PWD/yacreader_gl_flow_config_widget.h
}
macx{ macx{
HEADERS += $$PWD/yacreader_macosx_toolbar.h HEADERS += $$PWD/yacreader_macosx_toolbar.h
@ -29,7 +31,6 @@ SOURCES += $$PWD/help_about_dialog.cpp \
$$PWD/yacreader_field_plain_text_edit.cpp \ $$PWD/yacreader_field_plain_text_edit.cpp \
$$PWD/yacreader_flow.cpp \ $$PWD/yacreader_flow.cpp \
$$PWD/yacreader_flow_config_widget.cpp \ $$PWD/yacreader_flow_config_widget.cpp \
#$$PWD/yacreader_gl_flow_config_widget.cpp \
$$PWD/yacreader_options_dialog.cpp \ $$PWD/yacreader_options_dialog.cpp \
$$PWD/yacreader_search_line_edit.cpp \ $$PWD/yacreader_search_line_edit.cpp \
$$PWD/yacreader_spin_slider_widget.cpp \ $$PWD/yacreader_spin_slider_widget.cpp \
@ -43,6 +44,10 @@ SOURCES += $$PWD/help_about_dialog.cpp \
$$PWD/yacreader_treeview.cpp \ $$PWD/yacreader_treeview.cpp \
$$PWD/yacreader_busy_widget.cpp $$PWD/yacreader_busy_widget.cpp
!CONFIG(no_opengl){
SOURCES += $$PWD/yacreader_gl_flow_config_widget.cpp
}
macx{ macx{
OBJECTIVE_SOURCES += $$PWD/yacreader_macosx_toolbar.mm OBJECTIVE_SOURCES += $$PWD/yacreader_macosx_toolbar.mm
} }

4
custom_widgets/yacreader_options_dialog.cpp
View File

@ -102,8 +102,10 @@ YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget * parent)
connect(gl->performanceSlider, SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged())); connect(gl->performanceSlider, SIGNAL(valueChanged(int)),this,SIGNAL(optionsChanged()));
connect(gl->vSyncCheck,SIGNAL(stateChanged(int)),this,SLOT(saveUseVSync(int))); connect(gl->vSyncCheck,SIGNAL(stateChanged(int)),this,SLOT(saveUseVSync(int)));
#endif
} }
#ifndef NO_OPENGL
void YACReaderOptionsDialog::savePerformance(int value) void YACReaderOptionsDialog::savePerformance(int value)
{ {
settings->setValue(PERFORMANCE,value); settings->setValue(PERFORMANCE,value);
@ -128,8 +130,6 @@ void YACReaderOptionsDialog::saveFlowParameters()
settings->setValue(LIGHT_STRENGTH,gl->lightStrength->getValue()); settings->setValue(LIGHT_STRENGTH,gl->lightStrength->getValue());
settings->setValue(MAX_ANGLE,gl->maxAngle->getValue()); settings->setValue(MAX_ANGLE,gl->maxAngle->getValue());
} }
#else
}
#endif #endif
void YACReaderOptionsDialog::saveOptions() void YACReaderOptionsDialog::saveOptions()