mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed YACReader compilation after spliting yacreader_global

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-12-12 13:16:18 +01:00
parent e1de588e40
commit e7c9404503
5 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
YACReader/YACReader.pro
View File

@ -99,38 +99,39 @@ CONFIG -= flat
QT += multimedia QT += multimedia
# Input # Input
HEADERS += ../common/comic.h \ HEADERS += ../common/comic.h \
configuration.h \ configuration.h \
goto_dialog.h \ goto_dialog.h \
magnifying_glass.h \ magnifying_glass.h \
main_window_viewer.h \ main_window_viewer.h \
viewer.h \ viewer.h \
goto_flow.h \ goto_flow.h \
options_dialog.h \ options_dialog.h \
../common/bookmarks.h \ ../common/bookmarks.h \
bookmarks_dialog.h \ bookmarks_dialog.h \
render.h \ render.h \
shortcuts_dialog.h \ shortcuts_dialog.h \
translator.h \ translator.h \
goto_flow_widget.h \ goto_flow_widget.h \
page_label_widget.h \ page_label_widget.h \
goto_flow_toolbar.h \ goto_flow_toolbar.h \
width_slider.h \ width_slider.h \
notifications_label_widget.h \ notifications_label_widget.h \
../common/pictureflow.h \ ../common/pictureflow.h \
../common/custom_widgets.h \ ../common/custom_widgets.h \
../common/check_new_version.h \ ../common/check_new_version.h \
../common/qnaturalsorting.h \ ../common/qnaturalsorting.h \
../common/yacreader_global.h \ ../common/yacreader_global.h \
../common/onstart_flow_selection_dialog.h \ ../common/yacreader_global_gui.h \
../common/comic_db.h \ ../common/onstart_flow_selection_dialog.h \
../common/folder.h \ ../common/comic_db.h \
../common/library_item.h \ ../common/folder.h \
yacreader_local_client.h \ ../common/library_item.h \
../common/http_worker.h \ yacreader_local_client.h \
../common/exit_check.h \ ../common/http_worker.h \
../common/scroll_management.h \ ../common/exit_check.h \
../common/opengl_checker.h ../common/scroll_management.h \
../common/opengl_checker.h
!CONFIG(no_opengl) { !CONFIG(no_opengl) {
CONFIG(legacy_gl_widget) { CONFIG(legacy_gl_widget) {
@ -142,38 +143,39 @@ HEADERS += ../common/comic.h \
HEADERS += goto_flow_gl.h HEADERS += goto_flow_gl.h
} }
SOURCES += ../common/comic.cpp \ SOURCES += ../common/comic.cpp \
configuration.cpp \ configuration.cpp \
goto_dialog.cpp \ goto_dialog.cpp \
magnifying_glass.cpp \ magnifying_glass.cpp \
main_window_viewer.cpp \ main_window_viewer.cpp \
viewer.cpp \ viewer.cpp \
goto_flow.cpp \ goto_flow.cpp \
options_dialog.cpp \ options_dialog.cpp \
../common/bookmarks.cpp \ ../common/bookmarks.cpp \
bookmarks_dialog.cpp \ bookmarks_dialog.cpp \
render.cpp \ render.cpp \
shortcuts_dialog.cpp \ shortcuts_dialog.cpp \
translator.cpp \ translator.cpp \
goto_flow_widget.cpp \ goto_flow_widget.cpp \
page_label_widget.cpp \ page_label_widget.cpp \
goto_flow_toolbar.cpp \ goto_flow_toolbar.cpp \
width_slider.cpp \ width_slider.cpp \
notifications_label_widget.cpp \ notifications_label_widget.cpp \
../common/pictureflow.cpp \ ../common/pictureflow.cpp \
../common/custom_widgets.cpp \ ../common/custom_widgets.cpp \
../common/check_new_version.cpp \ ../common/check_new_version.cpp \
../common/qnaturalsorting.cpp \ ../common/qnaturalsorting.cpp \
../common/onstart_flow_selection_dialog.cpp \ ../common/onstart_flow_selection_dialog.cpp \
../common/comic_db.cpp \ ../common/comic_db.cpp \
../common/folder.cpp \ ../common/folder.cpp \
../common/library_item.cpp \ ../common/library_item.cpp \
yacreader_local_client.cpp \ yacreader_local_client.cpp \
../common/http_worker.cpp \ ../common/http_worker.cpp \
../common/yacreader_global.cpp \ ../common/yacreader_global.cpp \
../common/exit_check.cpp \ ../common/yacreader_global_gui.cpp \
../common/scroll_management.cpp \ ../common/exit_check.cpp \
../common/opengl_checker.cpp ../common/scroll_management.cpp \
../common/opengl_checker.cpp
!CONFIG(no_opengl) { !CONFIG(no_opengl) {
CONFIG(legacy_gl_widget) { CONFIG(legacy_gl_widget) {

2
YACReader/configuration.h
View File

@ -8,7 +8,7 @@
#include <QSettings> #include <QSettings>
#include <QDate> #include <QDate>
#include "yacreader_global.h" #include "yacreader_global_gui.h"
#define CONF_FILE_PATH "." #define CONF_FILE_PATH "."
#define SLIDE_ASPECT_RATIO 1.585 #define SLIDE_ASPECT_RATIO 1.585

2
YACReader/goto_flow.h
View File

@ -2,6 +2,8 @@
#define __GOTO_FLOW_H #define __GOTO_FLOW_H
#include "goto_flow_widget.h" #include "goto_flow_widget.h"
#include "yacreader_global_gui.h"
#include <QThread> #include <QThread>
#include <QWaitCondition> #include <QWaitCondition>

2
YACReader/goto_flow_widget.h
View File

@ -3,7 +3,7 @@
#include <QWidget> #include <QWidget>
#include <QSettings> #include <QSettings>
#include "yacreader_global.h" #include "yacreader_global_gui.h"
using namespace YACReader; using namespace YACReader;

2
YACReader/render.cpp
View File

@ -10,7 +10,7 @@
#include <typeinfo> #include <typeinfo>
#include "comic_db.h" #include "comic_db.h"
#include "yacreader_global.h" #include "yacreader_global_gui.h"
template<class T> template<class T>
inline const T& kClamp( const T& x, const T& low, const T& high ) inline const T& kClamp( const T& x, const T& low, const T& high )