Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 61e0611

Browse files
committedFeb 7, 2025·
moved unicapture to a separate directory
1 parent b8ddbb8 commit 61e0611

File tree

11 files changed

+42
-34
lines changed

11 files changed

+42
-34
lines changed
 

‎CMakeLists.txt

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ include_directories(${LS2_INCLUDE_DIRS})
3535
pkg_check_modules(PMLOG REQUIRED PmLogLib)
3636
include_directories(${PMLOG_INCLUDE_DIRS})
3737

38+
add_subdirectory(unicapture)
3839

3940
find_package(Git)
4041
add_custom_target(version
@@ -48,8 +49,6 @@ add_executable(hyperion-webos
4849
src/main.c
4950
src/settings.c
5051
src/service.c
51-
src/unicapture.c
52-
src/converter.c
5352
src/log.c
5453
src/utils.c
5554
src/hyperion_client.c
@@ -63,36 +62,6 @@ set_target_properties(hyperion-webos PROPERTIES
6362
# LINK_FLAGS "-Wl,-rpath,'$ORIGIN:$ORIGIN/lib' -Wl,-z,origin"
6463
)
6564
target_include_directories(hyperion-webos PRIVATE ${CMAKE_BINARY_DIR})
66-
target_link_libraries(hyperion-webos fbs flatccrt pthread dl yuv rt ${GTHREAD2_LDFLAGS} ${PBNJSON_LDFLAGS} ${LS2_LDFLAGS} ${GLIB2_LDFLAGS} ${PMLOG_LDFLAGS})
67-
add_dependencies(hyperion-webos version gm_backend dile_vt_backend halgal_backend vtcapture_backend)
65+
target_link_libraries(hyperion-webos fbs flatccrt pthread dl unicapture rt ${GTHREAD2_LDFLAGS} ${PBNJSON_LDFLAGS} ${LS2_LDFLAGS} ${GLIB2_LDFLAGS} ${PMLOG_LDFLAGS})
66+
add_dependencies(hyperion-webos version)
6867
set_property(TARGET hyperion-webos PROPERTY ENABLE_EXPORTS 1)
69-
70-
# "Unified" v2 Backends
71-
add_library(gm_backend SHARED
72-
src/backends/libgm.c
73-
)
74-
target_include_directories(gm_backend PRIVATE src src/backends)
75-
target_link_libraries(gm_backend gm)
76-
77-
add_library(dile_vt_backend SHARED
78-
src/backends/libdile_vt.c
79-
)
80-
target_include_directories(dile_vt_backend PRIVATE src src/backends)
81-
target_link_libraries(dile_vt_backend dile_vt)
82-
83-
# libdile_vt.so seems to be missing DT_NEEDED for libPmLogLib.so.3 - let's just
84-
# add it over to our library. For some reason adding PmLogLib loaded via
85-
# pkgconfig to target_link_libraries doesn't work...
86-
set_target_properties(dile_vt_backend PROPERTIES LINK_FLAGS "-lPmLogLib")
87-
88-
add_library(halgal_backend SHARED
89-
src/backends/libhalgal.c
90-
)
91-
target_include_directories(halgal_backend PRIVATE src src/backends)
92-
target_link_libraries(halgal_backend halgal)
93-
94-
add_library(vtcapture_backend SHARED
95-
src/backends/libvtcapture.cpp
96-
)
97-
target_include_directories(vtcapture_backend PRIVATE src src/backends)
98-
target_link_libraries(vtcapture_backend vtcapture)

‎unicapture/CMakeLists.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
add_library(unicapture STATIC
2+
unicapture.c
3+
converter.c
4+
)
5+
set(UNICAPTURE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/../src")
6+
target_include_directories(unicapture PUBLIC ${UNICAPTURE_INCLUDE_DIRS})
7+
target_link_libraries(unicapture PUBLIC yuv)
8+
9+
# "Unified" v2 Backends
10+
add_library(gm_backend SHARED
11+
backends/libgm.c
12+
)
13+
target_include_directories(gm_backend PRIVATE ${UNICAPTURE_INCLUDE_DIRS} backends)
14+
target_link_libraries(gm_backend gm)
15+
16+
add_library(dile_vt_backend SHARED
17+
backends/libdile_vt.c
18+
)
19+
target_include_directories(dile_vt_backend PRIVATE ${UNICAPTURE_INCLUDE_DIRS} backends)
20+
target_link_libraries(dile_vt_backend dile_vt)
21+
22+
# libdile_vt.so seems to be missing DT_NEEDED for libPmLogLib.so.3 - let's just
23+
# add it over to our library. For some reason adding PmLogLib loaded via
24+
# pkgconfig to target_link_libraries doesn't work...
25+
set_target_properties(dile_vt_backend PROPERTIES LINK_FLAGS "-lPmLogLib")
26+
27+
add_library(halgal_backend SHARED
28+
backends/libhalgal.c
29+
)
30+
target_include_directories(halgal_backend PRIVATE ${UNICAPTURE_INCLUDE_DIRS} backends)
31+
target_link_libraries(halgal_backend halgal)
32+
33+
add_library(vtcapture_backend SHARED
34+
backends/libvtcapture.cpp
35+
)
36+
target_include_directories(vtcapture_backend PRIVATE ${UNICAPTURE_INCLUDE_DIRS} backends)
37+
target_link_libraries(vtcapture_backend vtcapture)
38+
39+
add_dependencies(unicapture gm_backend dile_vt_backend halgal_backend vtcapture_backend)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)
Please sign in to comment.