WIP

wistia · May 7, 2024 · 0b1dfb2 · 0b1dfb2
1 parent 9f7d07e
commit 0b1dfb2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -2,7 +2,7 @@ name: CI
 
 on:
  push:
- branches: [ main ]
+# branches: [ main ]
  pull_request:
  branches: [ main ]
  workflow_dispatch:
@@ -27,6 +27,9 @@ jobs:
  with:
  go-version: "1.22"
 
+ - run: ls -l /Users/runner/work/lilliput/lilliput/deps/osx/arm64/share/OpenCV/3rdparty/lib || true
+ - run: ls -l /Users/runner/work/lilliput/lilliput/deps/linux/arm64/share/OpenCV/3rdparty/lib || true
+
  - name: Build
  run: go build
 

diff --git a/giflib.go b/giflib.go
@@ -6,7 +6,8 @@ package lilliput
 // #cgo CXXFLAGS: -std=c++11
 // #cgo darwin,arm64 CXXFLAGS: -I${SRCDIR}/deps/osx/arm64/include
 // #cgo linux,amd64 CXXFLAGS: -I${SRCDIR}/deps/linux/amd64/include
-// #cgo LDFLAGS: -lgif
+// #cgo LDFLAGS: -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ljpeg -lpng -lwebp -lz -lgif
+// #cgo amd64 LDFLAGS: -lippicv
 // #cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/deps/osx/arm64/lib -L${SRCDIR}/deps/osx/arm64/share/OpenCV/3rdparty/lib
 // #cgo linux,amd64 LDFLAGS: -L${SRCDIR}/deps/linux/amd64/lib -L${SRCDIR}/deps/linux/amd64/share/OpenCV/3rdparty/lib
 // #include "giflib.hpp"

diff --git a/opencv.go b/opencv.go
@@ -6,8 +6,8 @@ package lilliput
 // #cgo CXXFLAGS: -std=c++11
 // #cgo darwin,arm64 CXXFLAGS: -I${SRCDIR}/deps/osx/arm64/include
 // #cgo linux,amd64 CXXFLAGS: -I${SRCDIR}/deps/linux/amd64/include
-// #cgo LDFLAGS: -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lsharpyuv -ljpeg -lpng -ltegra_hal
-// #cgo arm64 LDFLAGS: -framework CoreVideo
+// #cgo LDFLAGS: -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lopencv_highgui -lsharpyuv -ljpeg -lpng -lwebp -lz -lm
+// #cgo arm64 LDFLAGS: -framework CoreVideo -ltegra_hal
 // #cgo amd64 LDFLAGS: -lippicv
 // #cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/deps/osx/arm64/lib -L${SRCDIR}/deps/osx/arm64/share/OpenCV/3rdparty/lib
 // #cgo linux,amd64 LDFLAGS: -L${SRCDIR}/deps/linux/amd64/lib -L${SRCDIR}/deps/linux/amd64/share/OpenCV/3rdparty/lib

diff --git a/webp.go b/webp.go
@@ -6,7 +6,7 @@ package lilliput
 // #cgo CXXFLAGS: -std=c++11
 // #cgo darwin,arm64 CXXFLAGS: -I${SRCDIR}/deps/osx/arm64/include
 // #cgo linux,amd64 CXXFLAGS: -I${SRCDIR}/deps/linux/arm64/include
-// #cgo LDFLAGS: -lwebp -lwebpmux
+// #cgo LDFLAGS: -lwebp -lwebpmux -lsharpyuv
 // #cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/deps/osx/arm64/lib -L${SRCDIR}/deps/osx/arm64/share/OpenCV/3rdparty/lib
 // #cgo linux,amd64 LDFLAGS: -L${SRCDIR}/deps/linux/amd64/lib -L${SRCDIR}/deps/linux/amd64/share/OpenCV/3rdparty/lib
 // #include "webp.hpp"