Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: buggins/coolreader
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: OpenInkpot/cr3
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Nov 12, 2017

  1. Copy the full SHA
    3eeb86e View commit details

Commits on Dec 4, 2017

  1. Copy the full SHA
    fe2bf4a View commit details
Showing with 794 additions and 1 deletion.
  1. +7 −1 CMakeLists.txt
  2. +22 −0 cr3gui/CMakeLists.txt
  3. +532 −0 cr3gui/src/cr3wayland.cpp
  4. +233 −0 cr3gui/src/cr3wayland.h
8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ if (NOT DEFINED GUI)
SET(GUI QT5)
message("GUI type is not specified!\n")
message("Using ${GUI} as default\n")
message("Add cmake parameter -D GUI={QT|QT5|WX|CRGUI_XCB|CRGUI_NANOX|CRGUI_PB|CRGUI_QT|CRGUI_JINKE_PLUGIN|CRGUI_WIN32|FB2PROPS} to use another GUI frontend\n")
message("Add cmake parameter -D GUI={QT|QT5|WX|CRGUI_XCB|CRGUI_WL|CRGUI_NANOX|CRGUI_PB|CRGUI_QT|CRGUI_JINKE_PLUGIN|CRGUI_WIN32|FB2PROPS} to use another GUI frontend\n")
else ()
message("Using GUI frontend ${GUI}\n")
endif (NOT DEFINED GUI)
@@ -280,6 +280,12 @@ if ( ${GUI} STREQUAL CRGUI_XCB )
message("Freetype include dir: ${FREETYPE_INCLUDE_DIRS}")
ADD_SUBDIRECTORY(crengine)
ADD_SUBDIRECTORY(cr3gui)
elseif ( ${GUI} STREQUAL CRGUI_WL )
message("Will make CR3GUI for Wayland")
ADD_DEFINITIONS( -DUSE_FREETYPE2=1 ${CRGUI_DEFS} )
message("Freetype include dir: ${FREETYPE_INCLUDE_DIRS}")
ADD_SUBDIRECTORY(crengine)
ADD_SUBDIRECTORY(cr3gui)
elseif ( ${GUI} STREQUAL CRGUI_NANOX )
message("Will make CR3GUI for NanoX")
if (ENABLE_DBUS_VIEWER_EVENTS)
22 changes: 22 additions & 0 deletions cr3gui/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -90,6 +90,28 @@ if ( ${GUI} STREQUAL CRGUI_XCB )
INSTALL( DIRECTORY ${CMAKE_BINARY_DIR}${CMAKE_DATA_DIR}/i18n/ DESTINATION share/locale
FILES_MATCHING PATTERN "*.mo" )

elseif ( ${GUI} STREQUAL CRGUI_WL )

ADD_DEFINITIONS( -DUSE_FONTCONFIG=1 )
SET(CR3_SOURCES ${CR3_SOURCES} src/cr3wayland.cpp)
SET (EXTRA_LIBS fontconfig wayland-client rt)
IF (GETTEXT_FOUND)
SET (EXTRA_LIBS ${EXTRA_LIBS} ${GETTEXT_LIBRARIES})
ELSE(${GETTEXT_FOUND})
MESSAGE("Gettext not found")
ENDIF (GETTEXT_FOUND)
INSTALL( FILES ${CR3_STYLES} DESTINATION share/cr3)
INSTALL( FILES data/desktop/cr3.desktop DESTINATION share/applications)
IF (${DEVICE_NAME} STREQUAL all)
INSTALL( DIRECTORY data/devices/v3/skins DESTINATION share/cr3/v3 )
INSTALL( DIRECTORY data/devices/n516/skins DESTINATION share/cr3/n516 )
INSTALL( DIRECTORY data/devices/v3/keymaps/ DESTINATION share/cr3/v3 )
INSTALL( DIRECTORY data/devices/n516/keymaps/ DESTINATION share/cr3/n516 )
ELSE()
INSTALL( DIRECTORY data/devices/${DEVICE_NAME}/skins DESTINATION share/cr3 )
INSTALL( DIRECTORY data/devices/${DEVICE_NAME}/keymaps DESTINATION share/cr3 )
ENDIF(${DEVICE_NAME} STREQUAL all)

elseif ( ${GUI} STREQUAL CRGUI_QT )

FIND_PACKAGE( Qt4 REQUIRED )
Loading