g

Author: steel-bucket

.github/workflows/build_windows.yml

@@ -15,7 +15,7 @@ on:
       - "**.h"
       - "windows/**"
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [ opened, synchronize, reopened ]
     paths:
       - ".github/workflows/build_windows.yml"
       - "**.c"
@@ -34,6 +34,8 @@ jobs:
           msbuild-architecture: x64
       - name: Install gpac
         run: choco install gpac --version 2.4.0
+      - name: Install nanomsg
+        run: choco install nanomsg
       - name: Setup vcpkg
         run: mkdir C:\vcpkg\.cache
       - name: Cache vcpkg
@@ -48,7 +50,7 @@ jobs:
           git clone https://github.com/microsoft/vcpkg
           ./vcpkg/bootstrap-vcpkg.bat
       - name: Install dependencies
-        run: ${{ github.workspace }}/vcpkg/vcpkg.exe install nanomsg --x-install-root ${{ github.workspace }}/vcpkg/installed/
+        run: ${{ github.workspace }}/vcpkg/vcpkg.exe install --x-install-root ${{ github.workspace }}/vcpkg/installed/
         working-directory: windows
       - uses: actions-rs/toolchain@v1
         with:
@@ -85,6 +87,8 @@ jobs:
           msbuild-architecture: x64
       - name: Install gpac
         run: choco install gpac --version 2.4.0
+      - name: Install nanomsg
+        run: choco install nanomsg
       - name: Setup vcpkg
         run: mkdir C:\vcpkg\.cache
       - name: Cache vcpkg
@@ -99,7 +103,7 @@ jobs:
           git clone https://github.com/microsoft/vcpkg
           ./vcpkg/bootstrap-vcpkg.bat
       - name: Install dependencies
-        run: ${{ github.workspace }}/vcpkg/vcpkg.exe install nanomsg --x-install-root ${{ github.workspace }}/vcpkg/installed/
+        run: ${{ github.workspace }}/vcpkg/vcpkg.exe install --x-install-root ${{ github.workspace }}/vcpkg/installed/
         working-directory: windows
       - uses: actions-rs/toolchain@v1
         with:

mac/build.command

@@ -52,7 +52,7 @@ SRC_FREETYPE="../src/thirdparty/freetype/autofit/autofit.c \
 		../src/thirdparty/freetype/type42/type42.c \
 		../src/thirdparty/freetype/winfonts/winfnt.c"
 BLD_SOURCES="../src/ccextractor.c $SRC_API $SRC_CCX $SRC_LIB_HASH $SRC_LIBPNG $SRC_PROTOBUF $SRC_UTF8 $SRC_ZLIB $SRC_ZVBI $SRC_FREETYPE"
-BLD_LINKER="-lm -liconv -lpthread -ldl -lnanomsg `pkg-config --libs --silence-errors tesseract` `pkg-config --libs --silence-errors gpac`"
+BLD_LINKER="-lm -liconv -lpthread -ldl `pkg-config --libs --silence-errors tesseract` `pkg-config --libs --silence-errors gpac` `pkg-config --libs --silence-errors nanomsg`"
 [[ $1 = "OCR" ]] && BLD_LINKER="$BLD_LINKER `pkg-config --libs --silence-errors tesseract` `pkg-config --libs --silence-errors lept`"
 
 ./pre-build.sh