diff --git a/CMakeLists.txt b/CMakeLists.txt index a4c74ed..814d897 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.0) project(quik_stbi LANGUAGES C VERSION 1.0) -add_compile_options(-static-libgcc) +if (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")) + add_compile_options(-static-libgcc) +endif() add_library(stbi SHARED "quik_stbi.c") install( diff --git a/Quik.Common b/Quik.Common index d9c98b5..fdfac9d 160000 --- a/Quik.Common +++ b/Quik.Common @@ -1 +1 @@ -Subproject commit d9c98b5cdc37b2ba1855c8fa9ce0fac8266b0f89 +Subproject commit fdfac9d95134fb5637bb2a9ec98ee11fe188230e diff --git a/Quik.StbImage.csproj b/Quik.StbImage.csproj index c8f983f..5033ae1 100644 --- a/Quik.StbImage.csproj +++ b/Quik.StbImage.csproj @@ -12,7 +12,7 @@ True Quik.StbImage - 1.0.0 + 1.1.0 STBI Authors, H. Utku Maden A C# wrapper for the ubiquitous Stb Image library. @@ -56,6 +56,16 @@ true PreserveNewest + + runtimes/osx-x64/native/ + true + PreserveNewest + + + runtimes/osx-arm64/native/ + true + PreserveNewest + diff --git a/Stbi.Manual.cs b/Stbi.Manual.cs index 30e8254..59b11cf 100644 --- a/Stbi.Manual.cs +++ b/Stbi.Manual.cs @@ -19,7 +19,8 @@ namespace Quik.Stb "runtimes/linux-arm/native/libstbi.so", "runtimes/linux-arm64/native/libstbi.so", "runtimes/linux-x64/native/libstbi.so", - "runtimes/native/libstbi.dylib", + "runtimes/osx-arm64/libstbi.dylib", + "runtimes/osx-x64/libstbi.dylib", "libstbi.dll", "libstbi.so", "libstbi.dylib",