Skip to content

Commit b94da11

Browse files
committed
Formatting and Buildfile changes
1 parent f5874eb commit b94da11

File tree

5 files changed

+15
-4
lines changed

5 files changed

+15
-4
lines changed

.github/workflows/build_windows.yml

-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ jobs:
8585
msbuild-architecture: x64
8686
- name: Install gpac
8787
run: choco install gpac --version 2.4.0
88-
- name: Install nanomsg
89-
run: choco install nanomsg
9088
- name: Setup vcpkg
9189
run: mkdir C:\vcpkg\.cache
9290
- name: Cache vcpkg

src/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ endif (PKG_CONFIG_FOUND AND WITH_OCR)
212212

213213
if (PKG_CONFIG_FOUND AND WITH_SHARING)
214214

215-
pkg_check_modules (NANOMSG REQUIRED libnanomsg)
215+
pkg_check_modules (NANOMSG REQUIRED nanomsg)
216216
set (EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_STATIC_LIBRARIES})
217217

218218
include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/")
@@ -251,6 +251,9 @@ endif (PKG_CONFIG_FOUND AND WITH_HARDSUBX)
251251

252252
add_executable (ccextractor ${SOURCEFILE} ${FREETYPE_SOURCE} ${UTF8PROC_SOURCE})
253253

254+
255+
256+
254257
########################################################
255258
# Build with Rust library
256259
########################################################

src/lib_ccx/ccx_common_constants.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ enum ccx_debug_message_types
5757
CCX_DMT_PMT = 0x800, // Program Map Table dump
5858
CCX_DMT_LEVENSHTEIN = 0x1000, // Levenshtein distance calculations
5959
CCX_DMT_DVB = 0x2000, // DVB
60-
CCX_DMT_DUMPDEF = 0x4000 // Dump defective TS packets
60+
CCX_DMT_DUMPDEF = 0x4000, // Dump defective TS packets
6161
#ifdef ENABLE_SHARING
6262
CCX_DMT_SHARE = 0x8000, // Extracted captions sharing service
6363
#endif //ENABLE_SHARING

src/rust/Cargo.lock

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/rust/Cargo.toml

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ num-integer = "0.1.45"
2929
lib_ccxr = { path = "lib_ccxr" }
3030
url = "2.5.2"
3131
libc = "0.2.169"
32+
nanomsg = { version = "0.7.2" }
33+
prost = "0.13.4"
34+
prost-types = "0.13.4"
35+
lazy_static = "1.5.0"
36+
nanomsg-sys = "0.7.2"
3237

3338
[build-dependencies]
3439
bindgen = "0.64.0"

0 commit comments

Comments
 (0)