diff --git a/Quik.FreeType/Quik.Freetype.csproj b/Quik.FreeType/Quik.FreeType.csproj
similarity index 100%
rename from Quik.FreeType/Quik.Freetype.csproj
rename to Quik.FreeType/Quik.FreeType.csproj
diff --git a/Quik.Media.Stb/QFontStbtt.cs b/Quik.Media.Defaults/QFontStbtt.cs
similarity index 97%
rename from Quik.Media.Stb/QFontStbtt.cs
rename to Quik.Media.Defaults/QFontStbtt.cs
index 62b5557..bae87ec 100644
--- a/Quik.Media.Stb/QFontStbtt.cs
+++ b/Quik.Media.Defaults/QFontStbtt.cs
@@ -1,3 +1,4 @@
+#if DISABLE
using System;
using System.IO;
using Quik.Media.Color;
@@ -33,4 +34,5 @@ namespace Quik.Media.Stb
throw new NotImplementedException();
}
}
-}
\ No newline at end of file
+}
+#endif
diff --git a/Quik.Media.Stb/QImageStbi.cs b/Quik.Media.Defaults/QImageStbi.cs
similarity index 100%
rename from Quik.Media.Stb/QImageStbi.cs
rename to Quik.Media.Defaults/QImageStbi.cs
diff --git a/Quik.Media.Stb/Quik.Media.Stb.csproj b/Quik.Media.Defaults/Quik.Media.Defaults.csproj
similarity index 83%
rename from Quik.Media.Stb/Quik.Media.Stb.csproj
rename to Quik.Media.Defaults/Quik.Media.Defaults.csproj
index 5f5fbf8..0868f36 100644
--- a/Quik.Media.Stb/Quik.Media.Stb.csproj
+++ b/Quik.Media.Defaults/Quik.Media.Defaults.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/Quik.Media.Stb/StbMediaLoader.cs b/Quik.Media.Defaults/StbMediaLoader.cs
similarity index 100%
rename from Quik.Media.Stb/StbMediaLoader.cs
rename to Quik.Media.Defaults/StbMediaLoader.cs
diff --git a/Quik.sln b/Quik.sln
index 86ebc24..c68da08 100644
--- a/Quik.sln
+++ b/Quik.sln
@@ -7,17 +7,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quik.OpenTK", "Quik.OpenTK\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quik.StbImage", "Quik.StbImage\Quik.StbImage.csproj", "{B1D7A987-F50A-4B6C-943D-F74525431BF5}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quik.StbTrueType", "Quik.StbTrueType\Quik.StbTrueType.csproj", "{AD5B02B0-F957-4816-8CE9-5F278B856C70}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quik.Media.Stb", "Quik.Media.Stb\Quik.Media.Stb.csproj", "{3D354BE0-42A7-45C4-AAEA-B0F8963A5745}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AE05ADE5-A809-479F-97D5-BEAFE7604285}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quik.Stb.Tests", "tests\Quik.Stb.Tests\Quik.Stb.Tests.csproj", "{BC7D3002-B79B-4141-B6CC-74FB2175B474}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuikDemo", "tests\QuikDemo\QuikDemo.csproj", "{79CBF97F-4884-4692-94FB-75DDEB61E26F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quik.Freetype", "Quik.FreeType\Quik.Freetype.csproj", "{2C347CB2-C50C-49B2-AAA4-70FE0ED6461B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quik.FreeType", "Quik.FreeType\Quik.FreeType.csproj", "{2C347CB2-C50C-49B2-AAA4-70FE0ED6461B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quik.Media.Defaults", "Quik.Media.Defaults\Quik.Media.Defaults.csproj", "{B517D2BF-CB9D-4448-BE50-EA85E100EB47}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -65,30 +63,6 @@ Global
{B1D7A987-F50A-4B6C-943D-F74525431BF5}.Release|x64.Build.0 = Release|Any CPU
{B1D7A987-F50A-4B6C-943D-F74525431BF5}.Release|x86.ActiveCfg = Release|Any CPU
{B1D7A987-F50A-4B6C-943D-F74525431BF5}.Release|x86.Build.0 = Release|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Debug|x64.ActiveCfg = Debug|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Debug|x64.Build.0 = Debug|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Debug|x86.ActiveCfg = Debug|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Debug|x86.Build.0 = Debug|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Release|Any CPU.Build.0 = Release|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Release|x64.ActiveCfg = Release|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Release|x64.Build.0 = Release|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Release|x86.ActiveCfg = Release|Any CPU
- {AD5B02B0-F957-4816-8CE9-5F278B856C70}.Release|x86.Build.0 = Release|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Debug|x64.ActiveCfg = Debug|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Debug|x64.Build.0 = Debug|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Debug|x86.Build.0 = Debug|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Release|Any CPU.Build.0 = Release|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Release|x64.ActiveCfg = Release|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Release|x64.Build.0 = Release|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Release|x86.ActiveCfg = Release|Any CPU
- {3D354BE0-42A7-45C4-AAEA-B0F8963A5745}.Release|x86.Build.0 = Release|Any CPU
{BC7D3002-B79B-4141-B6CC-74FB2175B474}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC7D3002-B79B-4141-B6CC-74FB2175B474}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC7D3002-B79B-4141-B6CC-74FB2175B474}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -125,6 +99,18 @@ Global
{2C347CB2-C50C-49B2-AAA4-70FE0ED6461B}.Release|x64.Build.0 = Release|Any CPU
{2C347CB2-C50C-49B2-AAA4-70FE0ED6461B}.Release|x86.ActiveCfg = Release|Any CPU
{2C347CB2-C50C-49B2-AAA4-70FE0ED6461B}.Release|x86.Build.0 = Release|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|x64.Build.0 = Debug|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Debug|x86.Build.0 = Debug|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|x64.ActiveCfg = Release|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|x64.Build.0 = Release|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|x86.ActiveCfg = Release|Any CPU
+ {B517D2BF-CB9D-4448-BE50-EA85E100EB47}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{BC7D3002-B79B-4141-B6CC-74FB2175B474} = {AE05ADE5-A809-479F-97D5-BEAFE7604285}
diff --git a/tests/QuikDemo/QuikDemo.csproj b/tests/QuikDemo/QuikDemo.csproj
index 9ae25ef..f4cd032 100644
--- a/tests/QuikDemo/QuikDemo.csproj
+++ b/tests/QuikDemo/QuikDemo.csproj
@@ -2,7 +2,7 @@
-
+