Explorar o código

(#5) try to fix linker errors

Credits: @zhiayang
rexim %!s(int64=5) %!d(string=hai) anos
pai
achega
e759651b13
Modificáronse 2 ficheiros con 6 adicións e 3 borrados
  1. 0 3
      .github/workflows/ci.yml
  2. 6 0
      Makefile

+ 0 - 3
.github/workflows/ci.yml

@@ -58,9 +58,6 @@ jobs:
         run: |
           cd third_party
           ./build_third_party.sh
-          echo "------------------------------"
-          find ./giflib-5.2.1-dist/
-          echo "------------------------------"
           cd ..
       - name: build vodus
         run: |

+ 6 - 0
Makefile

@@ -1,3 +1,5 @@
+UNAME:=$(shell uname)
+
 VODUS_EXTRA_CXXFLAGS=
 
 ifdef VODUS_SSE
@@ -9,6 +11,10 @@ VODUS_PKGS=freetype2
 VODUS_CXXFLAGS=-Wall -fno-exceptions -std=c++17 $(VODUS_EXTRA_CXXFLAGS) -ggdb `pkg-config --cflags $(VODUS_PKGS)` -I./third_party/ffmpeg-4.3-dist/usr/local/include/ -I./third_party/giflib-5.2.1-dist/usr/local/include/
 VODUS_LIBS=`pkg-config --libs $(VODUS_PKGS)` -L./third_party/giflib-5.2.1-dist/usr/local/lib/ -lgif -L./third_party/ffmpeg-4.3-dist/usr/local/lib/ -lavcodec -lavutil -lswresample -pthread -lm -llzma -lz
 
+ifeq ($(UNAME), Darwin)
+VODUS_LIBS += -framework AVFoundation -framework VideoToolbox -framework CoreVideo -framework AudioToolbox -framework CoreMedia -framework CoreFoundation -liconv
+endif
+
 EMOTE_DOWNLOADER_PKGS=libcurl
 EMOTE_DOWNLOADER_CXXFLAGS=-Wall -fno-exceptions -std=c++17 -ggdb `pkg-config --cflags $(EMOTE_DOWNLOADER_PKGS)`
 EMOTE_DOWNLOADER_LIBS=`pkg-config --libs $(EMOTE_DOWNLOADER_PKGS)`