Skip to content

Commit c0e1c27

Browse files
committed
f
1 parent 9f5ea05 commit c0e1c27

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.github/workflows/build_windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
git clone https://github.com/microsoft/vcpkg
4949
./vcpkg/bootstrap-vcpkg.bat
5050
- name: Install dependencies
51-
run: ${{ github.workspace }}/vcpkg/vcpkg.exe install --x-install-root ${{ github.workspace }}/vcpkg/installed/
51+
run: ${{ github.workspace }}/vcpkg/vcpkg.exe install nanomsg --x-install-root ${{ github.workspace }}/vcpkg/installed/
5252
working-directory: windows
5353
- uses: actions-rs/toolchain@v1
5454
with:
@@ -99,7 +99,7 @@ jobs:
9999
git clone https://github.com/microsoft/vcpkg
100100
./vcpkg/bootstrap-vcpkg.bat
101101
- name: Install dependencies
102-
run: ${{ github.workspace }}/vcpkg/vcpkg.exe install --x-install-root ${{ github.workspace }}/vcpkg/installed/
102+
run: ${{ github.workspace }}/vcpkg/vcpkg.exe install nanomsg --x-install-root ${{ github.workspace }}/vcpkg/installed/
103103
working-directory: windows
104104
- uses: actions-rs/toolchain@v1
105105
with:

mac/Makefile.am

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,14 @@ endif
244244

245245
ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP
246246

247-
ccextractor_LDFLAGS = $(shell pkg-config --libs gpac)
247+
ccextractor_LDFLAGS = $(shell pkg-config --libs gpac nanomsg)
248248
GPAC_CPPFLAGS = $(shell pkg-config --cflags gpac)
249+
NANOMSG_CPPFLAGS = $(shell pkg-config --cflags nanomsg)
249250

250251
ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/lib_ccx/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/
251252
ccextractor_CPPFLAGS += $(GPAC_CPPFLAGS)
252253
ccextractor_CPPFLAGS += $(FFMPEG_CPPFLAGS)
254+
ccextractor_CPPFLAGS += $(NANOMSG_CPPFLAGS)
253255

254256
ccextractor_LDADD=-lm -lpthread -ldl
255257

src/rust/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ FetchContent_Declare(
77
)
88
FetchContent_MakeAvailable(Corrosion)
99

10+
find_package(PkgConfig)
11+
pkg_check_modules(NANOMSG REQUIRED nanomsg)
12+
13+
set(EXTRA_INCLUDES ${EXTRA_INCLUDES} ${NANOMSG_INCLUDE_DIRS})
14+
set(EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_LIBRARIES})
15+
1016
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
1117
set(PROFILE "debug")
1218
else()

0 commit comments

Comments
 (0)