Merge branch 'master' into stable

[v1.1.0] Add OSX builds.
Move tests to this repository.
2024-04-06 16:00:05 +03:00 · 2024-04-06 15:58:05 +03:00 · 2024-03-23 11:59:40 +03:00 · 2024-03-23 11:36:16 +03:00 · 2024-03-23 10:59:23 +03:00 · 2024-03-21 18:39:44 +03:00
4 changed files with 17 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/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(
--- a/Quik.Common
+++ b/Quik.Common
@ -1 +1 @@
-Subproject commit d9c98b5cdc37b2ba1855c8fa9ce0fac8266b0f89
+Subproject commit fdfac9d95134fb5637bb2a9ec98ee11fe188230e
--- a/Quik.StbImage.csproj
+++ b/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>
--- 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",
Author	SHA1	Message	Date
H. Utku Maden	7cd55c8884	Merge branch 'master' into stable All checks were successful Build / build (push) Successful in 1m23s Details	2024-04-06 16:00:05 +03:00
H. Utku Maden	b077e06765	[v1.1.0] Add OSX builds.	2024-04-06 15:58:05 +03:00
H. Utku Maden	1d9f7d2ae6	Move tests to this repository.	2024-03-23 11:59:40 +03:00
H. Utku Maden	ab1cfe9243	Use unencrypted storage for the key because Nuget is nuget. All checks were successful Build / build (push) Successful in 1m2s Details	2024-03-23 11:36:16 +03:00
H. Utku Maden	2883c7faf8	Chnage build script. Some checks failed Build / build (push) Failing after 1m4s Details	2024-03-23 10:59:23 +03:00
H. Utku Maden	07f6da8ebe	This is getting out of hand. Some checks failed Build / build (push) Failing after 43s Details	2024-03-21 18:39:44 +03:00
H. Utku Maden	029375399f	Yet another attempt to fix CI builds. Some checks failed Build / build (push) Failing after 44s Details	2024-03-21 18:38:27 +03:00
H. Utku Maden	702083e961	YEss another useless push. Some checks failed Build / build (push) Failing after 51s Details	2024-03-21 18:24:22 +03:00
H. Utku Maden	1ff1603d00	List stuff. Some checks failed Build / build (push) Failing after 44s Details	2024-03-21 18:17:50 +03:00
H. Utku Maden	c41ba068a6	Another silly push. Some checks failed Build / build (push) Failing after 41s Details	2024-03-21 18:16:21 +03:00
H. Utku Maden	33000e5b54	List all files in home directory of the runner. Some checks failed Build / build (push) Failing after 52s Details	2024-03-21 18:13:33 +03:00
H. Utku Maden	4c87a7da1c	Merge branch 'stable' of https://git.mixedup.dev/QUIK/Quik.StbImage into stable Some checks failed Build / build (push) Failing after 42s Details	2024-03-21 18:11:30 +03:00
H. Utku Maden	e531ac6d15	Change build scripts slightly to maybe fix CI?	2024-03-21 18:10:55 +03:00
themixedupstuff	ed99bf210b	Update .gitea/workflows/build.yaml Some checks failed Build / build (push) Failing after 44s Details	2024-03-19 21:19:55 +01:00
H. Utku Maden	0d3b1760e3	Fix executable bit of higher repository. Some checks failed Build / build (push) Failing after 43s Details	2024-03-19 22:57:40 +03:00
H. Utku Maden	1b0fc116f2	Merge branch 'stable' of https://git.mixedup.dev/QUIK/Quik.StbImage into stable Some checks failed Build / build (push) Failing after 41s Details	2024-03-19 22:50:05 +03:00
H. Utku Maden	f60611e565	Add executable bit to shell scripts.	2024-03-19 22:49:57 +03:00
themixedupstuff	6e670cb57c	Where did my files go? Some checks failed Build / build (push) Failing after 42s Details	2024-03-19 20:46:38 +01:00
H. Utku Maden	8a0f1ba704	Trying to see if this helps. Some checks failed Build / build (push) Failing after 42s Details	2024-03-19 22:43:32 +03:00
H. Utku Maden	ed2425e6a3	Merge branch 'stable' of https://git.mixedup.dev/QUIK/Quik.StbImage into stable Some checks failed Build / build (push) Failing after 40s Details	2024-03-19 22:32:14 +03:00
H. Utku Maden	e5662ab8d3	Add docker-compose.yaml version.	2024-03-19 22:32:00 +03:00
themixedupstuff	c1f6dff68e	Update .gitea/workflows/build.yaml Some checks failed Build / build (push) Failing after 48s Details	2024-03-19 20:29:31 +01:00
H. Utku Maden	77efec25c8	Add a workflow.	2024-03-19 22:27:21 +03:00
H. Utku Maden	7a08f7d474	Fix removed old function.	2024-03-19 22:27:15 +03:00
H. Utku Maden	8d2e9ed980	Make more shell scripts.	2024-03-19 22:27:08 +03:00
H. Utku Maden	1e5e9e6fb5	Move Quik.StbImage to its own repository.	2024-03-19 22:02:20 +03:00