Intel MacOS Support

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.21)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_OSX_ARCHITECTURES "arm64")
+set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 if (MSVC)
@@ -95,6 +95,13 @@ else ()
         ${BZIP2_LIBRARY}
         "-lm -lbz2 -lz -liconv -pthread -framework Security -framework VideoToolbox -framework CoreFoundation -framework CoreMedia -framework CoreVideo -framework CoreServices -framework CoreAudio -framework AVFoundation -framework CoreGraphics -framework AudioToolbox -framework Metal -framework CoreImage -framework AppKit"
     ) # macos
+
+    if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") 
+        set(STATIC_LIBS
+            ${STATIC_LIBS}
+            ${CMAKE_SOURCE_DIR}/lib/liblzma.a
+        )
+    endif()
 endif()
 target_link_libraries(${PROJECT_NAME} ${STATIC_LIBS})
 

README.md

@@ -59,7 +59,7 @@ void audioRaw() {
 ### Windows
 To get the needed libraries on Windows, you can use vcpkg:
 ```sh
-vcpkg install ffmpeg[core,avcodec,avformat,avutil,swscale,swresample,amf,x264,x265,nvcodec,openh264,aom,vpx]:x64-windows-static --recurse
+vcpkg install ffmpeg[core,avcodec,avformat,swscale,swresample,amf,x264,x265,nvcodec,openh264,aom,vpx]:x64-windows-static --recurse
 ```
 the other libraries are part of the Windows SDK
 
@@ -86,12 +86,12 @@ brew install bzip2
 
 git clone https://code.videolan.org/videolan/x264.git
 cd x264
-./configure --enable-static --disable-shared
+./configure --enable-static
 make
 
 git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm
 mkdir output
-./configure --prefix=$PWD/output --enable-static --disable-shared --enable-libx264 --enable-gpl
+./configure --prefix=$PWD/output --enable-static --enable-libx264 --enable-gpl
 make
 ```