fix example projects; update README with new information about VisualD development

2015-11-13 09:59:32 +03:00 · 2015-11-13 09:59:32 +03:00 · d39536bd2a
parent 1eab899bd6
commit d39536bd2a
9 changed files with 99 additions and 447 deletions
--- a/README.md
+++ b/README.md
@ -299,6 +299,7 @@ Clone dependency libraries to dlangui/deps directory
        git clone https://github.com/DerelictOrg/DerelictSDL2.git
        git clone https://github.com/gecko0307/dlib.git
        git clone https://github.com/Dav1dde/gl3n.git
+        git clone https://github.com/Devisualization/image.git de_image

 Open solution file with Mono-D	

@ -345,6 +346,79 @@ Now you can build and run your project.
 To hack DlangIDE project, you can clone it from https://github.com/buggins/dlangide.git into the same directory dlangui is cloned to. Then just open solution dlangide/dlangide-monod-linux.sln with mono-d.


+Windows development using VisualD
+---------------------------------
+
+Install GIT, DUB, DMD, MS Visual Studio (e.g. Community 2013) + VisualD plugin
+
+
+Clone DlangUI repository
+
+        git clone https://github.com/buggins/dlangui.git
+
+Enter dlangui directory
+
+        cd dlangui
+
+Clone dependency libraries to dlangui/deps directory
+
+        mkdir deps
+        cd deps
+        git clone https://github.com/DerelictOrg/DerelictUtil.git
+        git clone https://github.com/DerelictOrg/DerelictGL3.git
+        git clone https://github.com/DerelictOrg/DerelictFT.git
+        git clone https://github.com/DerelictOrg/DerelictSDL2.git
+        git clone https://github.com/gecko0307/dlib.git
+        git clone https://github.com/Dav1dde/gl3n.git
+        git clone https://github.com/Devisualization/image.git de_image
+
+Open solution file with Visual-D
+
+        dlangui-msvc.sln
+
+Try running examples: helloworld, example1, tetris, dmledit
+
+Configurations Debug, Release, Unittest build SDL2+OpenGL versions of apps.
+
+Configurations DebugMinimal, ReleaseMinimal, UnittestMinimal build pure win32 versions of apps w/o OpenGL.
+
+
+If you are creating your own solution / project which uses DlangUI in Mono-D:
+
+  * Create new solution (assuming that solution directory is located in the same directory as dlangui and "Create directory for solution" option is unchecked; if no - you will need to correct pathes)
+  * Add / create source files of your project (e.g. copy+paste helloworld.d)
+  * Add dlangui library project dlangui/dlangui-monod-linux.dproj to solution
+  
+Following settings are to be applied to all configurations of your new project (Debug, Release, Unittest):
+
+  * In your project options Build/Project Dependencies - mark dlangui-monod-linux item
+  * In your project options Build/Compiling/Linking - check "Link in static/shared libraries from nested dependencies"
+  * In your project options Build/Compiling/Compiling - specify Version constants as "USE_FREETYPE;USE_OPENGL;EmbedStandardResources;Unicode;windows" (EmbedStandardResources is required if you want to embed your own additional resources into executable)
+  * If your project needs to embed some resources into executable (usually from "views" directory), specify all directories which contain resources in Build/Compiling/Compiling/Extra Compiler Options, e.g.:
+  
+        -Jviews
+        -Jviews/res
+        -Jviews/res/i18n
+        -Jviews/res/mdpi
+        -Jviews/res/hdpi
+  
+  * In your project options Build/Includes put list of import directories of DlangUI library and its dependencies, like
+  
+        ../dlangui/src
+        ../dlangui/deps/dlib
+        ../dlangui/deps/gl3n
+        ../dlangui/deps/DerelictSDL2/source
+        ../dlangui/deps/DerelictFT/source
+        ../dlangui/deps/DerelictGL3/source
+        ../dlangui/deps/DerelictUtil/source
+
+Now you can build and run your project.
+ 
+To hack DlangIDE project, you can clone it from https://github.com/buggins/dlangide.git into the same directory dlangui is cloned to. Then just open solution dlangide/dlangide-monod-linux.sln with mono-d.
+
+
+
+

 Linux builds (DUB)
 ------------------
--- a/dlangui-msvc.sln
+++ b/dlangui-msvc.sln
@ -5,27 +5,27 @@ VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dlangui", "dlangui-msvc.visualdproj", "{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}"
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "d3d", "examples\d3d\d3d_msvc.visualdproj", "{1C8C4726-B356-4533-90C7-88BDA875BF30}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "d3d", "examples\d3d\d3d-msvc.visualdproj", "{1C8C4726-B356-4533-90C7-88BDA875BF30}"
 	ProjectSection(ProjectDependencies) = postProject
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dmledit", "examples\dmledit\dmledit_msvc.visualdproj", "{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dmledit", "examples\dmledit\dmledit-msvc.visualdproj", "{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "example1", "examples\example1\example1_msvc.visualdproj", "{B1CA031C-C195-4938-8F3E-8BFF7DA68933}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "example1", "examples\example1\example1-msvc.visualdproj", "{B1CA031C-C195-4938-8F3E-8BFF7DA68933}"
 	ProjectSection(ProjectDependencies) = postProject
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "helloworld", "examples\helloworld\helloworld_msvc.visualdproj", "{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "helloworld", "examples\helloworld\helloworld-msvc.visualdproj", "{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "tetris", "examples\tetris\tetris_msvc.visualdproj", "{954B6A84-1EEC-42B0-B215-2A17842B1101}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "tetris", "examples\tetris\tetris-msvc.visualdproj", "{954B6A84-1EEC-42B0-B215-2A17842B1101}"
 	ProjectSection(ProjectDependencies) = postProject
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
--- a/examples/d3d/d3d-msvc.visualdproj
+++ b/examples/d3d/d3d-msvc.visualdproj
@ -53,7 +53,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -155,7 +155,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -257,7 +257,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -359,7 +359,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
--- a/examples/d3d/d3d.visualdproj
+++ b/examples/d3d/d3d.visualdproj
@ -1,210 +0,0 @@
-<DProject>
- <ProjectGuid>{55B79469-E5D8-4B58-89BD-5A3E11A696B0}</ProjectGuid>
- <Config name="Debug" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <multiobj>0</multiobj>
-  <singleFileCompilation>0</singleFileCompilation>
-  <oneobj>0</oneobj>
-  <mscoff>0</mscoff>
-  <trace>0</trace>
-  <quiet>0</quiet>
-  <verbose>0</verbose>
-  <vtls>0</vtls>
-  <vgc>0</vgc>
-  <symdebug>1</symdebug>
-  <optimize>0</optimize>
-  <cpu>0</cpu>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>0</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <nofloat>0</nofloat>
-  <Dversion>2.043</Dversion>
-  <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
-  <allinst>0</allinst>
-  <stackStomp>0</stackStomp>
-  <compiler>0</compiler>
-  <otherDMD>0</otherDMD>
-  <cccmd>$(CC) -c</cccmd>
-  <ccTransOpt>1</ccTransOpt>
-  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>Unicode  USE_OPENGL USE_FREETYPE EmbedStandardResources</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>1</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths />
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>2</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Config name="Release" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <multiobj>0</multiobj>
-  <singleFileCompilation>0</singleFileCompilation>
-  <oneobj>0</oneobj>
-  <mscoff>0</mscoff>
-  <trace>0</trace>
-  <quiet>0</quiet>
-  <verbose>0</verbose>
-  <vtls>0</vtls>
-  <vgc>0</vgc>
-  <symdebug>0</symdebug>
-  <optimize>0</optimize>
-  <cpu>0</cpu>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>1</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <nofloat>0</nofloat>
-  <Dversion>2.043</Dversion>
-  <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
-  <allinst>0</allinst>
-  <stackStomp>0</stackStomp>
-  <compiler>0</compiler>
-  <otherDMD>0</otherDMD>
-  <cccmd>$(CC) -c</cccmd>
-  <ccTransOpt>1</ccTransOpt>
-  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath />
-  <fileImppath />
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids />
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>0</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths />
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>1</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Folder name="d3d">
-  <File path="src\d3d.d" />
- </Folder>
-</DProject>
--- a/examples/dmledit/dmledit-msvc.visualdproj
+++ b/examples/dmledit/dmledit-msvc.visualdproj
@ -53,7 +53,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -155,7 +155,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -257,7 +257,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -359,7 +359,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
--- a/examples/dmledit/dmledit.visualdproj
+++ b/examples/dmledit/dmledit.visualdproj
@ -1,212 +0,0 @@
-<DProject>
- <ProjectGuid>{06D73450-2919-48A8-B2C3-738B12505D74}</ProjectGuid>
- <Config name="Debug" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <multiobj>0</multiobj>
-  <singleFileCompilation>0</singleFileCompilation>
-  <oneobj>0</oneobj>
-  <mscoff>0</mscoff>
-  <trace>0</trace>
-  <quiet>0</quiet>
-  <verbose>0</verbose>
-  <vtls>0</vtls>
-  <vgc>0</vgc>
-  <symdebug>1</symdebug>
-  <optimize>0</optimize>
-  <cpu>0</cpu>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>0</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <nofloat>0</nofloat>
-  <Dversion>2.043</Dversion>
-  <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
-  <allinst>0</allinst>
-  <stackStomp>0</stackStomp>
-  <compiler>0</compiler>
-  <otherDMD>0</otherDMD>
-  <cccmd>$(CC) -c</cccmd>
-  <ccTransOpt>1</ccTransOpt>
-  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>views views/res views/res/i18n views/res/mdpi</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode USE_FREETYPE</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>1</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths />
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>2</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Config name="Release" platform="Win32">
-  <obj>0</obj>
-  <link>0</link>
-  <lib>0</lib>
-  <subsystem>2</subsystem>
-  <multiobj>0</multiobj>
-  <singleFileCompilation>0</singleFileCompilation>
-  <oneobj>0</oneobj>
-  <mscoff>0</mscoff>
-  <trace>0</trace>
-  <quiet>0</quiet>
-  <verbose>0</verbose>
-  <vtls>0</vtls>
-  <vgc>0</vgc>
-  <symdebug>0</symdebug>
-  <optimize>0</optimize>
-  <cpu>0</cpu>
-  <isX86_64>0</isX86_64>
-  <isLinux>0</isLinux>
-  <isOSX>0</isOSX>
-  <isWindows>0</isWindows>
-  <isFreeBSD>0</isFreeBSD>
-  <isSolaris>0</isSolaris>
-  <scheduler>0</scheduler>
-  <useDeprecated>0</useDeprecated>
-  <errDeprecated>0</errDeprecated>
-  <useAssert>0</useAssert>
-  <useInvariants>0</useInvariants>
-  <useIn>0</useIn>
-  <useOut>0</useOut>
-  <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
-  <useSwitchError>0</useSwitchError>
-  <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
-  <release>1</release>
-  <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
-  <infowarnings>0</infowarnings>
-  <checkProperty>0</checkProperty>
-  <genStackFrame>0</genStackFrame>
-  <pic>0</pic>
-  <cov>0</cov>
-  <nofloat>0</nofloat>
-  <Dversion>2.043</Dversion>
-  <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
-  <allinst>0</allinst>
-  <stackStomp>0</stackStomp>
-  <compiler>0</compiler>
-  <otherDMD>0</otherDMD>
-  <cccmd>$(CC) -c</cccmd>
-  <ccTransOpt>1</ccTransOpt>
-  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath>views views/res views/res/i18n views/res/mdpi</fileImppath>
-  <outdir>$(ConfigurationName)</outdir>
-  <objdir>$(OutDir)</objdir>
-  <objname />
-  <libname />
-  <doDocComments>0</doDocComments>
-  <docdir />
-  <docname />
-  <modules_ddoc />
-  <ddocfiles />
-  <doHdrGeneration>0</doHdrGeneration>
-  <hdrdir />
-  <hdrname />
-  <doXGeneration>1</doXGeneration>
-  <xfilename>$(IntDir)\$(TargetName).json</xfilename>
-  <debuglevel>0</debuglevel>
-  <debugids />
-  <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources Unicode USE_FREETYPE</versionids>
-  <dump_source>0</dump_source>
-  <mapverbosity>0</mapverbosity>
-  <createImplib>0</createImplib>
-  <defaultlibname />
-  <debuglibname />
-  <moduleDepsFile />
-  <run>0</run>
-  <runargs />
-  <runCv2pdb>0</runCv2pdb>
-  <pathCv2pdb>$(VisualDInstallDir)cv2pdb\cv2pdb.exe</pathCv2pdb>
-  <cv2pdbPre2043>0</cv2pdbPre2043>
-  <cv2pdbNoDemangle>0</cv2pdbNoDemangle>
-  <cv2pdbEnumType>0</cv2pdbEnumType>
-  <cv2pdbOptions />
-  <objfiles />
-  <linkswitches />
-  <libfiles>ole32.lib kernel32.lib user32.lib comctl32.lib comdlg32.lib</libfiles>
-  <libpaths />
-  <deffile />
-  <resfile />
-  <exefile>$(OutDir)\$(ProjectName).exe</exefile>
-  <useStdLibPath>1</useStdLibPath>
-  <cRuntime>1</cRuntime>
-  <privatePhobos>0</privatePhobos>
-  <additionalOptions />
-  <preBuildCommand />
-  <postBuildCommand />
-  <filesToClean>*.obj;*.cmd;*.build;*.json;*.dep</filesToClean>
- </Config>
- <Folder name="dmledit">
-  <Folder name="src">
-   <File path="src\dmledit.d" />
-  </Folder>
- </Folder>
-</DProject>
--- a/examples/example1/example1-msvc.visualdproj
+++ b/examples/example1/example1-msvc.visualdproj
@ -53,7 +53,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -155,7 +155,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -257,7 +257,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -359,7 +359,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
--- a/examples/helloworld/helloworld-msvc.visualdproj
+++ b/examples/helloworld/helloworld-msvc.visualdproj
@ -53,7 +53,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -155,7 +155,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -257,7 +257,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -359,7 +359,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
--- a/examples/tetris/tetris-msvc.visualdproj
+++ b/examples/tetris/tetris-msvc.visualdproj
@ -53,7 +53,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -155,7 +155,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -257,7 +257,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>
@ -359,7 +359,7 @@
  <cccmd>$(CC) -c</cccmd>
  <ccTransOpt>1</ccTransOpt>
  <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
-  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
+  <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/deps/DerelictGL3/source  $(SolutionDir)/deps/DerelictUtil/source  $(SolutionDir)/deps/DerelictFT/source $(SolutionDir)/deps/DerelictSDL2/source $(SolutionDir)/deps/de_image/source/interfaces $(SolutionDir)/deps/de_image/source/png $(SolutionDir)/deps/dlib</imppath>
  <fileImppath>views views/res views/res/i18n views/res/mdpi views/res/hdpi</fileImppath>
  <outdir>$(ConfigurationName)</outdir>
  <objdir>$(OutDir)</objdir>