Skip to content

Allow for WebGL compilation via preprocessor macros #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Allow for WebGL compilation via preprocessor macros #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2f0091
WebGL preprocessor macros
zaneclaes Jun 18, 2025
43cd0e7
Revent win-x86 dll.meta changes
zaneclaes Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SkiaUnity/Assets/SkiaSharp/Editor/HBTextBlockEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if UNITY_EDITOR
#if UNITY_EDITOR && !UNITY_WEBGL

using SkiaSharp.Unity.HB;
using UnityEngine;
Expand Down Expand Up @@ -264,4 +264,4 @@ private static void RenderTextures() {
}

}
#endif
#endif
2 changes: 1 addition & 1 deletion SkiaUnity/Assets/SkiaSharp/Editor/SVGEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if UNITY_EDITOR
#if UNITY_EDITOR && !UNITY_WEBGL

using SkiaSharp.Unity;
using SkiaSharp.Unity.HB;
Expand Down
4 changes: 2 additions & 2 deletions SkiaUnity/Assets/SkiaSharp/Editor/SkottiePlayerEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if UNITY_EDITOR
#if UNITY_EDITOR && !UNITY_WEBGL
using System.Reflection;
using SkiaSharp.Unity;
using UnityEditor;
Expand Down Expand Up @@ -146,4 +146,4 @@ private static void RenderTextures() {
}

}
#endif
#endif
4 changes: 2 additions & 2 deletions SkiaUnity/Assets/SkiaSharp/Editor/SkottiePlayerV2Editor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if UNITY_EDITOR
#if UNITY_EDITOR && !UNITY_WEBGL
using System.Reflection;
using SkiaSharp.Unity;
using UnityEditor;
Expand Down Expand Up @@ -177,4 +177,4 @@ private static void RenderTextures() {
}

}
#endif
#endif
74 changes: 16 additions & 58 deletions SkiaUnity/Assets/SkiaSharp/Library/win-x64/libSkiaSharp.dll.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions SkiaUnity/Assets/SkiaSharp/Library/win-x86/libSkiaSharp.dll.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion SkiaUnity/Assets/SkiaSharp/Runtime/HB_TEXTBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if !UNITY_WEBGL
using System;
using System.Collections;
using System.Collections.Generic;
Expand Down Expand Up @@ -744,4 +745,5 @@ public void RefreshFontFamily() {
}
}
}
}
}
#endif
4 changes: 3 additions & 1 deletion SkiaUnity/Assets/SkiaSharp/Runtime/SVGLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if !UNITY_WEBGL
using System;
using UnityEngine;
using Svg.Skia;
Expand Down Expand Up @@ -80,4 +81,5 @@ public void CalculateLayoutInputVertical() { }
public float flexibleHeight { get; }
public int layoutPriority { get; }
}
}
}
#endif
4 changes: 3 additions & 1 deletion SkiaUnity/Assets/SkiaSharp/Runtime/SkottiePlayer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if !UNITY_WEBGL
using System;
using Newtonsoft.Json;
using UnityEngine;
Expand Down Expand Up @@ -223,4 +224,5 @@ private void OnDestroy() {

}
}
}
}
#endif
4 changes: 3 additions & 1 deletion SkiaUnity/Assets/SkiaSharp/Runtime/SkottiePlayerV2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if !UNITY_WEBGL
using System;
using System.IO;
using System.Text;
Expand Down Expand Up @@ -236,4 +237,5 @@ private void OnDestroy() {

}
}
}
}
#endif
14 changes: 7 additions & 7 deletions SkiaUnity/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"dependencies": {
"com.unity.2d.animation": "10.1.4",
"com.unity.2d.pixel-perfect": "5.0.3",
"com.unity.2d.psdimporter": "9.0.3",
"com.unity.2d.animation": "11.0.0",
"com.unity.2d.pixel-perfect": "5.1.0",
"com.unity.2d.psdimporter": "10.1.1",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "10.0.7",
"com.unity.2d.spriteshape": "11.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ai.navigation": "2.0.6",
"com.unity.collab-proxy": "2.7.1",
"com.unity.ide.rider": "3.0.35",
"com.unity.ai.navigation": "2.0.8",
"com.unity.collab-proxy": "2.8.2",
"com.unity.ide.rider": "3.0.36",
"com.unity.ide.visualstudio": "2.0.23",
"com.unity.ide.vscode": "1.2.5",
"com.unity.multiplayer.center": "1.0.0",
Expand Down
39 changes: 21 additions & 18 deletions SkiaUnity/Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"dependencies": {
"com.unity.2d.animation": {
"version": "10.1.4",
"version": "11.0.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "9.0.7",
"com.unity.2d.common": "10.0.0",
"com.unity.2d.sprite": "1.0.0",
"com.unity.collections": "1.2.4",
"com.unity.modules.animation": "1.0.0",
Expand All @@ -14,32 +14,35 @@
"url": "https://packages.unity.com"
},
"com.unity.2d.common": {
"version": "9.0.7",
"version": "10.0.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.8.4",
"com.unity.2d.sprite": "1.0.0",
"com.unity.mathematics": "1.1.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.uielements": "1.0.0"
"com.unity.burst": "1.8.4"
},
"url": "https://packages.unity.com"
},
"com.unity.2d.pixel-perfect": {
"version": "5.0.3",
"version": "5.1.0",
"depth": 0,
"source": "registry",
"dependencies": {},
"dependencies": {
"com.unity.modules.imgui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.2d.psdimporter": {
"version": "9.0.3",
"version": "10.1.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "9.0.4",
"com.unity.2d.sprite": "1.0.0"
"com.unity.2d.common": "10.0.0",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0"
},
"url": "https://packages.unity.com"
},
Expand All @@ -50,11 +53,11 @@
"dependencies": {}
},
"com.unity.2d.spriteshape": {
"version": "10.0.7",
"version": "11.0.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "9.0.7",
"com.unity.2d.common": "10.0.0",
"com.unity.mathematics": "1.1.0",
"com.unity.modules.physics2d": "1.0.0"
},
Expand All @@ -70,7 +73,7 @@
}
},
"com.unity.ai.navigation": {
"version": "2.0.6",
"version": "2.0.8",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -79,7 +82,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.8.19",
"version": "1.8.21",
"depth": 2,
"source": "registry",
"dependencies": {
Expand All @@ -89,7 +92,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.7.1",
"version": "2.8.2",
"depth": 0,
"source": "registry",
"dependencies": {},
Expand All @@ -114,7 +117,7 @@
"dependencies": {}
},
"com.unity.ide.rider": {
"version": "3.0.35",
"version": "3.0.36",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -178,11 +181,11 @@
}
},
"com.unity.test-framework.performance": {
"version": "3.0.3",
"version": "3.1.0",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.31",
"com.unity.test-framework": "1.1.33",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.com"
Expand Down
Loading