diff --git a/3rdparty/DerelictFT/DerelictFT.dproj b/3rdparty/DerelictFT/DerelictFT.dproj
index b2665d4c..ce601757 100644
--- a/3rdparty/DerelictFT/DerelictFT.dproj
+++ b/3rdparty/DerelictFT/DerelictFT.dproj
@@ -3,7 +3,7 @@
Debug
AnyCPU
- 10.0.0
+ 8.0.30703
2.0
{2B088613-C536-4E5C-8B74-7913267D75DA}
true
diff --git a/3rdparty/DerelictGL3/DerelictGL3.dproj b/3rdparty/DerelictGL3/DerelictGL3.dproj
index 1e627435..788820ce 100644
--- a/3rdparty/DerelictGL3/DerelictGL3.dproj
+++ b/3rdparty/DerelictGL3/DerelictGL3.dproj
@@ -3,7 +3,7 @@
Debug
AnyCPU
- 10.0.0
+ 8.0.30703
2.0
{5355CB25-5AA9-4738-9A0F-C0673DBBCB07}
true
diff --git a/3rdparty/DerelictSDL2/DerelictSDL2.dproj b/3rdparty/DerelictSDL2/DerelictSDL2.dproj
index e37479b6..7dad70b2 100644
--- a/3rdparty/DerelictSDL2/DerelictSDL2.dproj
+++ b/3rdparty/DerelictSDL2/DerelictSDL2.dproj
@@ -3,7 +3,7 @@
Debug
AnyCPU
- 10.0.0
+ 8.0.30703
2.0
{87EE4E19-2409-4441-A0C0-2E6D08C555D9}
true
diff --git a/3rdparty/DerelictUtil/DerelictUtil.dproj b/3rdparty/DerelictUtil/DerelictUtil.dproj
index 7e6fa74f..18ee409a 100644
--- a/3rdparty/DerelictUtil/DerelictUtil.dproj
+++ b/3rdparty/DerelictUtil/DerelictUtil.dproj
@@ -3,13 +3,19 @@
Debug
AnyCPU
- 10.0.0
+ 8.0.30703
2.0
{0B737AB4-0C3B-4250-A133-3AD793E2D322}
true
true
- DMD2
+ ldc2
true
+
+
+ source
+ .
+
+
true
@@ -21,11 +27,7 @@
StaticLibrary
true
0
-
-
- dl
-
-
+ -ldl
bin\Release
@@ -36,6 +38,11 @@
Executable
true
0
+
+
+ dl
+
+
true
@@ -47,10 +54,16 @@
Executable
true
0
+
+
+ dl
+
+
exception.d
+ obj/Debug/exception.o
loader.d
@@ -60,9 +73,11 @@
system.d
+ obj/Debug/system.o
wintypes.d
+ obj/Debug/wintypes.o
xtypes.d
diff --git a/3rdparty/dlib/dlib.dproj b/3rdparty/dlib/dlib.dproj
new file mode 100644
index 00000000..1d3b7be0
--- /dev/null
+++ b/3rdparty/dlib/dlib.dproj
@@ -0,0 +1,141 @@
+
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {174F5AAC-3D16-4AD9-9041-0DC0723A78FE}
+ true
+ true
+ DMD2
+ true
+
+
+ true
+ bin\Debug
+ obj/Debug
+ false
+ false
+ dlib
+ StaticLibrary
+ true
+ 0
+
+
+ bin\Release
+ obj/Release
+ false
+ false
+ dlib
+ Executable
+ true
+ 0
+
+
+ true
+ bin\Unittest
+ obj/Unittest
+ false
+ true
+ dlib
+ Executable
+ true
+ 0
+
+
+
+ compound.d
+
+
+ stream.d
+
+
+ delegaterange.d
+
+
+ filesystem.d
+
+
+ local.d
+
+
+ bitio.d
+
+
+ bmp.d
+
+
+ huffman.d
+
+
+ idct.d
+
+
+ io.d
+
+
+ jpeg.d
+
+
+ png.d
+
+
+ tga.d
+
+
+ utils.d
+
+
+ zlib.d
+
+
+ dirrange.d
+
+
+ common.d
+
+
+ directory.d
+
+
+ file.d
+
+
+ color.d
+
+
+ image.d
+
+
+ range.d
+
+
+ interpolation.d
+
+
+ matrix.d
+
+
+ vector.d
+
+
+ tuple.d
+
+
+ math\utils.d
+
+
+ math\decomposition.d
+
+
+ math\linsolve.d
+
+
+ memory.d
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dlangui-monod-lib.dproj b/dlangui-monod-lib.dproj
index 48d956d8..05b027a5 100644
--- a/dlangui-monod-lib.dproj
+++ b/dlangui-monod-lib.dproj
@@ -3,29 +3,30 @@
Debug
AnyCPU
- 10.0.0
+ 8.0.30703
2.0
{84FCA922-7BD9-4B9E-A192-A52F0A830AF5}
true
true
- DMD2
+ ldc2
true
- {ED644EF9-A446-4987-873F-B7F3CC28E3B7}
{2B088613-C536-4E5C-8B74-7913267D75DA}
{5355CB25-5AA9-4738-9A0F-C0673DBBCB07}
{0B737AB4-0C3B-4250-A133-3AD793E2D322}
{87EE4E19-2409-4441-A0C0-2E6D08C555D9}
+ {174F5AAC-3D16-4AD9-9041-0DC0723A78FE}
../DerelictUtil/source
- ../DerelictFI/source
../DerelictFT/source
../DerelictSDL2/source
../DerelictGL3/source
+ ../dlib
+ src
@@ -43,10 +44,16 @@
USE_SDL
USE_OPENGL
+ EmbedStandardResources
- project.ddoc -c -Dddocs
+ -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi
docs
+
+
+ dl
+
+
bin\Release
@@ -57,6 +64,7 @@
Executable
true
0
+ project.ddoc -c -Dddocs
true
@@ -68,6 +76,7 @@
Executable
true
0
+ project.ddoc -c -Dddocs
@@ -99,9 +108,20 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dlangui-monod.sln b/dlangui-monod.sln
index ec4bbcdf..02cf8df7 100644
--- a/dlangui-monod.sln
+++ b/dlangui-monod.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "dlangui-monod-lib", "dlangui-monod-lib.dproj", "{84FCA922-7BD9-4B9E-A192-A52F0A830AF5}"
EndProject
-Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "DerelictFI", "3rdparty\DerelictFI\DerelictFI.dproj", "{ED644EF9-A446-4987-873F-B7F3CC28E3B7}"
-EndProject
Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "DerelictFT", "3rdparty\DerelictFT\DerelictFT.dproj", "{2B088613-C536-4E5C-8B74-7913267D75DA}"
EndProject
Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "DerelictGL3", "3rdparty\DerelictGL3\DerelictGL3.dproj", "{5355CB25-5AA9-4738-9A0F-C0673DBBCB07}"
@@ -15,6 +13,8 @@ Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "DerelictSDL2", "3rdparty\De
EndProject
Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "example1", "examples\example1\example1.dproj", "{11EEFA98-AAC1-45BD-8972-C97571D2D196}"
EndProject
+Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "dlib", "3rdparty\dlib\dlib.dproj", "{174F5AAC-3D16-4AD9-9041-0DC0723A78FE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -34,6 +34,12 @@ Global
{11EEFA98-AAC1-45BD-8972-C97571D2D196}.Release|Any CPU.Build.0 = Release|Any CPU
{11EEFA98-AAC1-45BD-8972-C97571D2D196}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
{11EEFA98-AAC1-45BD-8972-C97571D2D196}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
+ {174F5AAC-3D16-4AD9-9041-0DC0723A78FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {174F5AAC-3D16-4AD9-9041-0DC0723A78FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {174F5AAC-3D16-4AD9-9041-0DC0723A78FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {174F5AAC-3D16-4AD9-9041-0DC0723A78FE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {174F5AAC-3D16-4AD9-9041-0DC0723A78FE}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
+ {174F5AAC-3D16-4AD9-9041-0DC0723A78FE}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
{2B088613-C536-4E5C-8B74-7913267D75DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2B088613-C536-4E5C-8B74-7913267D75DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B088613-C536-4E5C-8B74-7913267D75DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,14 +64,5 @@ Global
{87EE4E19-2409-4441-A0C0-2E6D08C555D9}.Release|Any CPU.Build.0 = Release|Any CPU
{87EE4E19-2409-4441-A0C0-2E6D08C555D9}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
{87EE4E19-2409-4441-A0C0-2E6D08C555D9}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
- {ED644EF9-A446-4987-873F-B7F3CC28E3B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {ED644EF9-A446-4987-873F-B7F3CC28E3B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {ED644EF9-A446-4987-873F-B7F3CC28E3B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {ED644EF9-A446-4987-873F-B7F3CC28E3B7}.Release|Any CPU.Build.0 = Release|Any CPU
- {ED644EF9-A446-4987-873F-B7F3CC28E3B7}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
- {ED644EF9-A446-4987-873F-B7F3CC28E3B7}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = examples\example1\example1.dproj
EndGlobalSection
EndGlobal
diff --git a/examples/example1/example1.dproj b/examples/example1/example1.dproj
index 4f3bab68..3caf296e 100644
--- a/examples/example1/example1.dproj
+++ b/examples/example1/example1.dproj
@@ -8,27 +8,28 @@
{11EEFA98-AAC1-45BD-8972-C97571D2D196}
true
true
- DMD2
+ ldc2
true
{84FCA922-7BD9-4B9E-A192-A52F0A830AF5}
- {ED644EF9-A446-4987-873F-B7F3CC28E3B7}
{2B088613-C536-4E5C-8B74-7913267D75DA}
{5355CB25-5AA9-4738-9A0F-C0673DBBCB07}
{0B737AB4-0C3B-4250-A133-3AD793E2D322}
{87EE4E19-2409-4441-A0C0-2E6D08C555D9}
+ {174F5AAC-3D16-4AD9-9041-0DC0723A78FE}
- ..\..\src
- ..\..\..\DerelictUtil\source
- ..\..\..\DerelictFI\source
- ..\..\..\DerelictFT\source
- ..\..\..\DerelictSDL2\source
- ..\..\..\DerelictGL3\source
- ..\..\3rdparty
+ ../../src
+ ../../../DerelictUtil/source
+ ../../../DerelictFI/source
+ ../../../DerelictFT/source
+ ../../../DerelictSDL2/source
+ ../../../DerelictGL3/source
+ ../../3rdparty
+ ../../../dlib
@@ -46,8 +47,12 @@
USE_SDL
USE_OPENGL
+ EmbedStandardResources
+ -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi
+
+ -ldl
bin\Release
@@ -71,6 +76,9 @@
0
-
+
+
+
+
\ No newline at end of file