Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit bbfcb9b

Browse filesBrowse files
tordextordex
committed
Rebuilt litebrowser with GTK4 (gtkmm4)
1 parent 0e7c315 commit bbfcb9b
Copy full SHA for bbfcb9b
Expand file treeCollapse file tree

20 files changed

+1612
-901
lines changed

‎.gitignore

Copy file name to clipboardExpand all lines: .gitignore
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ build/
3030
.settings
3131
.project
3232
.idea
33+
.vscode
3334

‎CMakeLists.txt

Copy file name to clipboardExpand all lines: CMakeLists.txt
+38-33Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ project(litebrowser CXX)
55
find_package(PkgConfig REQUIRED)
66

77
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
8-
message(STATUS "No build type selected, default to Release")
9-
set(CMAKE_BUILD_TYPE "Release")
8+
message(STATUS "No build type selected, default to Release")
9+
set(CMAKE_BUILD_TYPE "Release")
1010
endif()
1111

1212
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
@@ -19,48 +19,53 @@ set(LITEBROWSER_PATH src)
1919
set(LITEHTML_PATH litehtml)
2020
set(CONTAINER_PATH ${LITEHTML_PATH}/containers/cairo)
2121

22-
pkg_check_modules(LB_LIBS REQUIRED gdkmm-3.0 gtkmm-3.0 libcurl cairo pango pangocairo)
22+
pkg_check_modules(LB_LIBS REQUIRED gtkmm-4.0 libcurl cairo pango pangocairo)
2323

2424
set(SOURCE ${LITEBROWSER_PATH}/main.cpp
25-
${LITEBROWSER_PATH}/html_widget.cpp
26-
${LITEBROWSER_PATH}/browser_wnd.cpp
27-
${LITEBROWSER_PATH}/web_history.cpp
28-
${LITEBROWSER_PATH}/http_request.cpp
29-
${LITEBROWSER_PATH}/web_page.cpp
30-
${LITEBROWSER_PATH}/http_requests_pool.cpp
31-
${CONTAINER_PATH}/container_cairo.cpp
32-
${CONTAINER_PATH}/cairo_borders.cpp
33-
${CONTAINER_PATH}/container_cairo_pango.cpp
34-
)
25+
${LITEBROWSER_PATH}/widget/html_widget.cpp
26+
${LITEBROWSER_PATH}/browser_wnd.cpp
27+
${LITEBROWSER_PATH}/webpage/web_history.cpp
28+
${LITEBROWSER_PATH}/webpage/http_request.cpp
29+
${LITEBROWSER_PATH}/webpage/web_page.cpp
30+
${LITEBROWSER_PATH}/webpage/http_requests_pool.cpp
31+
${CONTAINER_PATH}/container_cairo.cpp
32+
${CONTAINER_PATH}/cairo_borders.cpp
33+
${CONTAINER_PATH}/container_cairo_pango.cpp
34+
)
3535

3636
set(HEADERS ${LITEBROWSER_PATH}/browser_wnd.h
37-
${LITEBROWSER_PATH}/html_widget.h
38-
${LITEBROWSER_PATH}/globals.h
39-
${LITEBROWSER_PATH}/web_history.h
40-
${LITEBROWSER_PATH}/http_request.h
41-
${LITEBROWSER_PATH}/web_page.h
42-
${LITEBROWSER_PATH}/html_host.h
43-
${LITEBROWSER_PATH}/http_requests_pool.h
44-
${LITEBROWSER_PATH}/html_dumper.h
45-
${CONTAINER_PATH}/container_cairo.h
46-
${CONTAINER_PATH}/cairo_borders.h
47-
${CONTAINER_PATH}/container_cairo_pango.h
48-
${CONTAINER_PATH}/cairo_images_cache.h
49-
)
37+
${LITEBROWSER_PATH}/widget/html_widget.h
38+
${LITEBROWSER_PATH}/webpage/web_history.h
39+
${LITEBROWSER_PATH}/webpage/http_request.h
40+
${LITEBROWSER_PATH}/webpage/web_page.h
41+
${LITEBROWSER_PATH}/webpage/html_host.h
42+
${LITEBROWSER_PATH}/webpage/http_requests_pool.h
43+
${LITEBROWSER_PATH}/html_dumper.h
44+
${CONTAINER_PATH}/container_cairo.h
45+
${CONTAINER_PATH}/cairo_borders.h
46+
${CONTAINER_PATH}/container_cairo_pango.h
47+
${CONTAINER_PATH}/cairo_images_cache.h
48+
)
49+
50+
if (FOR_TESTING)
51+
set(HEADERS ${HEADERS} litehtml-tests/fonts.h)
52+
set(SOURCE ${SOURCE} litehtml-tests/fonts.cpp)
53+
pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
54+
add_compile_options(-DFOR_TESTING)
55+
endif ()
5056

51-
option(LITEHTML_BUILD_TESTING "enable testing for litehtml" OFF)
5257
add_subdirectory(${LITEHTML_PATH})
5358

5459
# additional warnings
5560
add_compile_options(-Wall -Wextra -Wpedantic)
5661

5762
add_executable(${PROJECT_NAME} ${SOURCE} ${HEADERS})
58-
include_directories(${PROJECT_NAME} ${LITEHTML_PATH}/include ${LB_LIBS_INCLUDE_DIRS} ${CONTAINER_PATH})
59-
target_link_options(${PROJECT_NAME} PRIVATE ${LB_LIBS_LDFLAGS})
60-
target_link_libraries(${PROJECT_NAME} litehtml ${LB_LIBS_LIBRARIES})
63+
include_directories(${PROJECT_NAME} ${LITEHTML_PATH}/include ${LITEBROWSER_PATH}/webpage ${LITEBROWSER_PATH}/widget ${LB_LIBS_INCLUDE_DIRS} ${CONTAINER_PATH} litehtml-tests)
64+
target_link_options(${PROJECT_NAME} PRIVATE ${LB_LIBS_LDFLAGS} ${FONTCONFIG_LDFLAGS})
65+
target_link_libraries(${PROJECT_NAME} litehtml ${LB_LIBS_LIBRARIES} ${FONTCONFIG_LIBRARIES})
6166

6267
set_target_properties(${PROJECT_NAME} PROPERTIES
63-
CXX_STANDARD 17
64-
C_STANDARD 99
65-
)
68+
CXX_STANDARD 17
69+
C_STANDARD 99
70+
)
6671

‎litehtml

Copy file name to clipboard

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.