Merge branch 'master' into stable

CMakeLists.txt

@@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.0)
 
 project(quik_stbi LANGUAGES C VERSION 1.0)
 
+if (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin"))
     add_compile_options(-static-libgcc)
+endif()
 
 add_library(stbi SHARED "quik_stbi.c")
 install(

Quik.StbImage.csproj

@@ -12,7 +12,7 @@
     <!-- Nuget Properties. -->
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>Quik.StbImage</PackageId>
-    <Version>1.0.0</Version>
+    <Version>1.1.0</Version>
     <Authors>STBI Authors, H. Utku Maden</Authors>
     <Description>
       A C# wrapper for the ubiquitous Stb Image library.
@@ -56,6 +56,16 @@
       <Pack>true</Pack>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="runtimes/osx-x64/native/*.dll">
+      <PackagePath>runtimes/osx-x64/native/</PackagePath>
+      <Pack>true</Pack>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="runtimes/osx-arm64/native/*.dll">
+      <PackagePath>runtimes/osx-arm64/native/</PackagePath>
+      <Pack>true</Pack>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
 </Project>

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",