Change freetype ABI.

.gitea/workflows/build.yaml

@@ -1,19 +1,22 @@
 name: Build
-run-name: Build Quik.FreeType on Docker.
+run-name: Build ReFuel.FreeType on Docker.
 on:
   workflow_dispatch:
   push:
-    branches: [master, stable]
+    tags:
+      - '*'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: git.mixedup.dev/quik/docker-cross-compiler
+      image: git.mixedup.dev/refuel/docker-cross-compiler
       env:
-        QUIK_API_KEY: "${{secrets.QUIK_API_KEY}}"
+        REFUEL_API_KEY: "${{secrets.REFUEL_API_KEY}}"
+        NUGET_USER_NAME: "${{vars.NUGET_USER_NAME}}"
+        NUGET_INDEX: "${{vars.NUGET_INDEX}}"
       volumes:
-        - ${{ gitea.workspace }}:/home/quik/src
+        - ${{ gitea.workspace }}:/home/refuel/src
     steps:
       - name: Check repository out.
         uses: actions/checkout@v3
@@ -22,4 +25,4 @@ jobs:
       - name: Run Build Script
         run: "./build_native.sh"
       - name: Publish Package
-        run: "Quik.Common/sh/publish.sh ."
+        run: "./publish.sh ."

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "freetype"]
 	path = freetype
-	url = https://git.mixedup.dev/QUIK/freetype.git
-[submodule "Quik.Common"]
-	path = Quik.Common
-	url = https://git.mixedup.dev/QUIK/Quik.Common.git
+	url = https://git.mixedup.dev/ReFuel/freetype.git
+[submodule "docker-cross-compiler"]
+	path = docker-cross-compiler
+	url = https://git.mixedup.dev/ReFuel/docker-cross-compiler

FT.cs

@@ -2,7 +2,7 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-namespace Quik.FreeType
+namespace ReFuel.FreeType
 {
     public static class FT
     {
@@ -17,7 +17,8 @@ namespace Quik.FreeType
             "runtimes/linux-arm/native/libfreetype.so",
             "runtimes/linux-arm64/native/libfreetype.so",
             "runtimes/linux-x64/native/libfreetype.so",
-            "runtimes/native/libfreetype.dylib",
+            "runtimes/osx-arm64/libfreetype.dylib",
+            "runtimes/osx-x64/libfreetype.dylib",
             "libfreetype.dll",
             "libfreetype.so",
             "libfreetype.dylib",

FTError.cs

@@ -1,4 +1,4 @@
-namespace Quik.FreeType
+namespace ReFuel.FreeType
 {
     public enum FTError : int
     {

FTLoadFlags.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Quik.FreeType
+namespace ReFuel.FreeType
 {
     [Flags]
     public enum FTLoadFlags

FTRenderMode.cs

@@ -1,4 +1,4 @@
-namespace Quik.FreeType
+namespace ReFuel.FreeType
 {
     public enum FTRenderMode
     {

FaceFlag.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Quik.FreeType
+namespace ReFuel.FreeType
 {
     [Flags]
     public enum FaceFlag : int

ReFuel.FreeType.csproj

@@ -4,14 +4,14 @@
         <TargetFramework>net6.0</TargetFramework>
         <LangVersion>7.3</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <RuntimeIdentifiers>linux-arm;linux-arm64;linux-x64;win-x86;win-x64</RuntimeIdentifiers>
+        <RuntimeIdentifiers>linux-arm;linux-arm64;linux-x64;win-x86;win-x64;osx-arm64;osx-x64</RuntimeIdentifiers>
     </PropertyGroup>
 
     <PropertyGroup>
       <!-- Nuget Properties. -->
       <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-      <PackageId>Quik.FreeType</PackageId>
-      <Version>1.0.0</Version>
+      <PackageId>ReFuel.FreeType</PackageId>
+      <Version>0.1.0-rc.2</Version>
       <Authors>FreeType Authors, H. Utku Maden</Authors>
       <Description>
         A C# wrapper for the FreeType font loading library.

ReFuel.FreeType.sln

@@ -1,25 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.5.002.0
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Quik.FreeType", "Quik.FreeType.csproj", "{A19CFEF1-19F1-41DD-A784-29AEE6072315}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReFuel.FreeType", "ReFuel.FreeType.csproj", "{983377DF-BE92-42A5-A1B7-C2E1D5F3AAF2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A19CFEF1-19F1-41DD-A784-29AEE6072315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A19CFEF1-19F1-41DD-A784-29AEE6072315}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A19CFEF1-19F1-41DD-A784-29AEE6072315}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A19CFEF1-19F1-41DD-A784-29AEE6072315}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F64EFC25-A7C1-4A63-8068-D5626B24871F}
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{983377DF-BE92-42A5-A1B7-C2E1D5F3AAF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{983377DF-BE92-42A5-A1B7-C2E1D5F3AAF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{983377DF-BE92-42A5-A1B7-C2E1D5F3AAF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{983377DF-BE92-42A5-A1B7-C2E1D5F3AAF2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

Structures.cs

@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 // Disable unused warnings for native types.
 #pragma warning disable CS0649
 
-namespace Quik.FreeType
+namespace ReFuel.FreeType
 {
     public struct FTLibrary
     {

build_native.sh

@@ -1,11 +1,16 @@
 #!/bin/bash
 cd $(dirname "$0")
 
-CMAKE_DIR="$PWD/Quik.Common/cmake"
-NOINSTALL=1
-QUIK_ADDITIONAL_CMAKE="-D BUILD_SHARED_LIBS=true -D NO_SONAME=true"
+export CMAKE_DIR="$PWD/docker-cross-compiler/cmake"
+export NOINSTALL=1
+export REFUEL_ADDITIONAL_CMAKE="-D BUILD_SHARED_LIBS=true -D NO_SONAME=true"
 
-./Quik.Common/sh/quik_build_native.sh "$PWD/freetype"
+# Clang Builds
+./docker-cross-compiler/sh/build_native.sh "$PWD/freetype" "osx-arm64 osx-x64"
+
+# GCC Builds
+export REFUEL_ADDITIONAL_CMAKE="$REFUEL_ADDITIONAL_CMAKE -D COMPILE_OPTIONS=\"-static-libgcc;-static-libstdc++;-fno-exceptions\""
+./docker-cross-compiler/sh/build_native.sh "$PWD/freetype" "linux-arm linux-arm64 linux-x64 win-x64 win-x86"
 
 # Copy out natives from their respective directories into runtimes
 mkdir -p \
@@ -13,12 +18,16 @@ mkdir -p \
     ./runtimes/linux-arm64/native \
     ./runtimes/linux-x64/native \
     ./runtimes/win-x64/native \
-    ./runtimes/win-x86/native
+    ./runtimes/win-x86/native \
+    ./runtimes/osx-arm64 \
+    ./runtimes/osx-x64
 
 cp ./out/linux-arm/libfreetype.so runtimes/linux-arm/native/libfreetype.so
 cp ./out/linux-arm64/libfreetype.so runtimes/linux-arm64/native/libfreetype.so
 cp ./out/linux-x64/libfreetype.so runtimes/linux-x64/native/libfreetype.so
 cp ./out/win-x64/libfreetype.dll runtimes/win-x64/native/libfreetype.dll
 cp ./out/win-x86/libfreetype.dll runtimes/win-x86/native/libfreetype.dll
+cp ./out/osx-arm64/libfreetype.dylib runtimes/osx-arm64/native/libfreetype.dylib
+cp ./out/osx-x64/libfreetype.dylib runtimes/osx-x64/native/libfreetype.dylib
 
 dotnet build

publish.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+cd $(dirname "$0")
+
+if [ -z "$REFUEL_API_KEY" ]
+then
+    echo "Please define REFUEL_API_KEY"
+    exit 1
+fi
+
+if [ -z "$NUGET_USER_NAME" ]
+then
+    echo "Please define NUGET_USER_NAME"
+    exit 1
+fi
+
+if [ -z "$NUGET_INDEX" ]
+then
+    echo "Please define NUGET_INDEX"
+    exit 1
+fi
+
+dotnet nuget add source \
+    -n ReFuel -u "$NUGET_USER_NAME" -p "$REFUEL_API_KEY" \
+    --store-password-in-clear-text \
+    "$NUGET_INDEX"
+dotnet nuget push -s ReFuel bin/*/*.nupkg