From 194a2546a3097f74ced93115327ddee63f78d4f3 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Mon, 18 Apr 2016 11:35:07 +0300
Subject: [PATCH] update mono-d Windows project files; fix #234

---
 README.md                                     |  1 +
 dlangui-monod-windows.dproj                   | 54 ++++++++++++++++---
 examples/dmledit/dmledit-monod-linux.dproj    |  1 -
 examples/dmledit/dmledit-monod-osx.dproj      |  1 -
 examples/dmledit/dmledit-monod-windows.dproj  |  5 +-
 examples/example1/example1-monod-linux.dproj  |  1 -
 examples/example1/example1-monod-osx.dproj    |  1 -
 .../example1/example1-monod-windows.dproj     | 12 ++---
 .../helloworld/helloworld-monod-linux.dproj   |  1 -
 .../helloworld/helloworld-monod-osx.dproj     |  1 -
 .../helloworld/helloworld-monod-windows.dproj | 12 ++---
 examples/tetris/tetris-monod-linux.dproj      |  1 -
 examples/tetris/tetris-monod-osx.dproj        |  1 -
 examples/tetris/tetris-monod-windows.dproj    | 12 ++---
 14 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index cfe540b5..b4da89e3 100644
--- a/README.md
+++ b/README.md
@@ -299,6 +299,7 @@ Following settings are to be applied to all configurations of your new project (
   * In your project options Build/Includes put list of import directories of DlangUI library and its dependencies, like
   
         ../dlangui/src
+        ../dlangui/3rdparty
         ../dlangui/deps/DerelictSDL2/source
         ../dlangui/deps/DerelictFT/source
         ../dlangui/deps/DerelictGL3/source
diff --git a/dlangui-monod-windows.dproj b/dlangui-monod-windows.dproj
index fb289892..b1c4bcce 100644
--- a/dlangui-monod-windows.dproj
+++ b/dlangui-monod-windows.dproj
@@ -26,7 +26,12 @@
     <Target>StaticLibrary</Target>
     <OutputName>libdlangui-monod-windows</OutputName>
     <UnittestMode>false</UnittestMode>
-    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <ExtraCompilerArguments>-Jviews
+-Jviews/res
+-Jviews/res/i18n
+-Jviews/res/shaders
+-Jviews/res/mdpi
+-Jviews/res/hdpi</ExtraCompilerArguments>
     <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
     <ObjectsDirectory>obj\Debug</ObjectsDirectory>
     <VersionIds>
@@ -45,7 +50,12 @@
     <Target>StaticLibrary</Target>
     <OutputName>libdlangui-monod-windows</OutputName>
     <UnittestMode>false</UnittestMode>
-    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <ExtraCompilerArguments>-Jviews
+-Jviews/res
+-Jviews/res/i18n
+-Jviews/res/shaders
+-Jviews/res/mdpi
+-Jviews/res/hdpi</ExtraCompilerArguments>
     <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
     <ObjectsDirectory>obj\Release</ObjectsDirectory>
     <VersionIds>
@@ -65,7 +75,12 @@
     <Target>Executable</Target>
     <OutputName>libdlangui-monod-windows</OutputName>
     <UnittestMode>true</UnittestMode>
-    <ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/hdpi -Jviews/res/mdpi</ExtraCompilerArguments>
+    <ExtraCompilerArguments>-Jviews
+-Jviews/res
+-Jviews/res/i18n
+-Jviews/res/shaders
+-Jviews/res/mdpi
+-Jviews/res/hdpi</ExtraCompilerArguments>
     <LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
     <ObjectsDirectory>obj\Unittest</ObjectsDirectory>
     <VersionIds>
@@ -79,7 +94,6 @@
     <DebugLevel>0</DebugLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="src\dlangui\package.d" />
     <Compile Include="src\dlangui\core\collections.d" />
     <Compile Include="src\dlangui\core\css.d" />
     <Compile Include="src\dlangui\core\cssparser.d" />
@@ -91,6 +105,7 @@
     <Compile Include="src\dlangui\core\linestream.d" />
     <Compile Include="src\dlangui\core\logger.d" />
     <Compile Include="src\dlangui\core\math3d.d" />
+    <Compile Include="src\dlangui\core\parseutils.d" />
     <Compile Include="src\dlangui\core\settings.d" />
     <Compile Include="src\dlangui\core\signals.d" />
     <Compile Include="src\dlangui\core\stdaction.d" />
@@ -99,11 +114,13 @@
     <Compile Include="src\dlangui\core\types.d" />
     <Compile Include="src\dlangui\dialogs\dialog.d" />
     <Compile Include="src\dlangui\dialogs\filedlg.d" />
+    <Compile Include="src\dlangui\dialogs\inputbox.d" />
     <Compile Include="src\dlangui\dialogs\msgbox.d" />
     <Compile Include="src\dlangui\dialogs\settingsdialog.d" />
     <Compile Include="src\dlangui\dml\annotations.d" />
     <Compile Include="src\dlangui\dml\dmlhighlight.d" />
     <Compile Include="src\dlangui\dml\parser.d" />
+    <Compile Include="src\dlangui\dml\tokenizer.d" />
     <Compile Include="src\dlangui\graphics\colors.d" />
     <Compile Include="src\dlangui\graphics\drawbuf.d" />
     <Compile Include="src\dlangui\graphics\domrender.d" />
@@ -114,17 +131,21 @@
     <Compile Include="src\dlangui\graphics\images.d" />
     <Compile Include="src\dlangui\graphics\resources.d" />
     <Compile Include="src\dlangui\graphics\scene\camera.d" />
+    <Compile Include="src\dlangui\graphics\scene\drawableobject.d" />
+    <Compile Include="src\dlangui\graphics\scene\effect.d" />
+    <Compile Include="src\dlangui\graphics\scene\fbximport.d" />
+    <Compile Include="src\dlangui\graphics\scene\light.d" />
+    <Compile Include="src\dlangui\graphics\scene\material.d" />
+    <Compile Include="src\dlangui\graphics\scene\mesh.d" />
+    <Compile Include="src\dlangui\graphics\scene\model.d" />
     <Compile Include="src\dlangui\graphics\scene\node.d" />
+    <Compile Include="src\dlangui\graphics\scene\objimport.d" />
     <Compile Include="src\dlangui\graphics\scene\scene3d.d" />
     <Compile Include="src\dlangui\graphics\scene\transform.d" />
     <Compile Include="src\dlangui\graphics\xpm\xpmcolors.d" />
     <Compile Include="src\dlangui\graphics\xpm\reader.d" />
     <Compile Include="src\dlangui\platforms\common\platform.d" />
-    <Compile Include="src\dlangui\platforms\common\startup.d" />
     <Compile Include="src\dlangui\platforms\sdl\sdlapp.d" />
-    <Compile Include="src\dlangui\platforms\windows\win32drawbuf.d" />
-    <Compile Include="src\dlangui\platforms\windows\win32fonts.d" />
-    <Compile Include="src\dlangui\platforms\windows\winapp.d" />
     <Compile Include="src\dlangui\widgets\appframe.d" />
     <Compile Include="src\dlangui\widgets\combobox.d" />
     <Compile Include="src\dlangui\widgets\controls.d" />
@@ -204,6 +225,7 @@
     <Compile Include="3rdparty\fontconfig\functions.d" />
     <Compile Include="3rdparty\fontconfig\package.d" />
     <Compile Include="3rdparty\fontconfig\types.d" />
+    <Compile Include="src\dlangui\package.d" />
     <Compile Include="deps\DerelictFT\source\derelict\freetype\ft.d" />
     <Compile Include="deps\DerelictFT\source\derelict\freetype\functions.d" />
     <Compile Include="deps\DerelictFT\source\derelict\freetype\types.d" />
@@ -235,6 +257,22 @@
     <Compile Include="deps\DerelictUtil\source\derelict\util\system.d" />
     <Compile Include="deps\DerelictUtil\source\derelict\util\wintypes.d" />
     <Compile Include="deps\DerelictUtil\source\derelict\util\xtypes.d" />
+    <Compile Include="src\dlangui\platforms\x11\x11app.d" />
+    <Compile Include="src\dlangui\platforms\common\startup.d" />
+    <Compile Include="src\dlangui\core\config.d" />
+    <Compile Include="3rdparty\dimage\array.d" />
+    <Compile Include="3rdparty\dimage\bitio.d" />
+    <Compile Include="3rdparty\dimage\compound.d" />
+    <Compile Include="3rdparty\dimage\huffman.d" />
+    <Compile Include="3rdparty\dimage\idct.d" />
+    <Compile Include="3rdparty\dimage\image.d" />
+    <Compile Include="3rdparty\dimage\jpeg.d" />
+    <Compile Include="3rdparty\dimage\memory.d" />
+    <Compile Include="3rdparty\dimage\png.d" />
+    <Compile Include="3rdparty\dimage\stream.d" />
+    <Compile Include="3rdparty\dimage\zlib.d" />
+    <Compile Include="src\dlangui\core\asyncsocket.d" />
+    <Compile Include="src\dlangui\core\queue.d" />
   </ItemGroup>
   <ItemGroup>
     <None Include="3rdparty\win32\makefile" />
diff --git a/examples/dmledit/dmledit-monod-linux.dproj b/examples/dmledit/dmledit-monod-linux.dproj
index b8c18eed..2288281f 100644
--- a/examples/dmledit/dmledit-monod-linux.dproj
+++ b/examples/dmledit/dmledit-monod-linux.dproj
@@ -12,7 +12,6 @@
       <Includes>
         <Path>../../src</Path>
         <Path>../../3rdparty</Path>
-        <Path>../../deps/gl3n</Path>
         <Path>../../deps/DerelictSDL2/source</Path>
         <Path>../../deps/DerelictFT/source</Path>
         <Path>../../deps/DerelictGL3/source</Path>
diff --git a/examples/dmledit/dmledit-monod-osx.dproj b/examples/dmledit/dmledit-monod-osx.dproj
index 023c0857..cc2fdbfd 100644
--- a/examples/dmledit/dmledit-monod-osx.dproj
+++ b/examples/dmledit/dmledit-monod-osx.dproj
@@ -17,7 +17,6 @@
       <Includes>
         <Path>../../src</Path>
         <Path>../../3rdparty</Path>
-        <Path>../../deps/gl3n</Path>
         <Path>../../deps/DerelictGL3/source</Path>
         <Path>../../deps/DerelictSDL2/source</Path>
         <Path>../../deps/DerelictFT/source</Path>
diff --git a/examples/dmledit/dmledit-monod-windows.dproj b/examples/dmledit/dmledit-monod-windows.dproj
index 15bf72ae..d23d1031 100644
--- a/examples/dmledit/dmledit-monod-windows.dproj
+++ b/examples/dmledit/dmledit-monod-windows.dproj
@@ -11,11 +11,11 @@
     <Includes>
       <Includes>
         <Path>..\..\src</Path>
-        <Path>..\..\deps\DerelictFT\source</Path>
+        <Path>..\..\3rdparty</Path>
         <Path>..\..\deps\DerelictSDL2\source</Path>
+        <Path>..\..\deps\DerelictFT\source</Path>
         <Path>..\..\deps\DerelictGL3\source</Path>
         <Path>..\..\deps\DerelictUtil\source</Path>
-        <Path>..\..\deps\gl3n</Path>
       </Includes>
     </Includes>
     <DependentProjectIds>
@@ -85,6 +85,7 @@
         <String>windows</String>
       </VersionIds>
     </VersionIds>
+    <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\dmledit.d" />
diff --git a/examples/example1/example1-monod-linux.dproj b/examples/example1/example1-monod-linux.dproj
index 42aa20d4..cc8f53f6 100644
--- a/examples/example1/example1-monod-linux.dproj
+++ b/examples/example1/example1-monod-linux.dproj
@@ -17,7 +17,6 @@
       <Includes>
         <Path>../../src</Path>
         <Path>../../3rdparty</Path>
-        <Path>../../deps/gl3n</Path>
         <Path>../../deps/x11/source</Path>
         <Path>../../deps/DerelictSDL2/source</Path>
         <Path>../../deps/DerelictFT/source</Path>
diff --git a/examples/example1/example1-monod-osx.dproj b/examples/example1/example1-monod-osx.dproj
index b20b7e3e..faacad9c 100644
--- a/examples/example1/example1-monod-osx.dproj
+++ b/examples/example1/example1-monod-osx.dproj
@@ -17,7 +17,6 @@
       <Includes>
         <Path>../../src</Path>
         <Path>../../3rdparty</Path>
-        <Path>../../deps/gl3n</Path>
         <Path>../../deps/DerelictGL3/source</Path>
         <Path>../../deps/DerelictSDL2/source</Path>
         <Path>../../deps/DerelictFT/source</Path>
diff --git a/examples/example1/example1-monod-windows.dproj b/examples/example1/example1-monod-windows.dproj
index 0cf2223e..207d9acf 100644
--- a/examples/example1/example1-monod-windows.dproj
+++ b/examples/example1/example1-monod-windows.dproj
@@ -15,12 +15,12 @@
     </DependentProjectIds>
     <Includes>
       <Includes>
-        <Path>..\..\src</Path>
-        <Path>..\..\deps\DerelictFT\source</Path>
-        <Path>..\..\deps\DerelictSDL2\source</Path>
-        <Path>..\..\deps\DerelictGL3\source</Path>
-        <Path>..\..\deps\DerelictUtil\source</Path>
-        <Path>..\..\deps\gl3n</Path>
+        <Path>../../src</Path>
+        <Path>../../3rdparty</Path>
+        <Path>../../deps/DerelictSDL2/source</Path>
+        <Path>../../deps/DerelictFT/source</Path>
+        <Path>../../deps/DerelictGL3/source</Path>
+        <Path>../../deps/DerelictUtil/source</Path>
       </Includes>
     </Includes>
   </PropertyGroup>
diff --git a/examples/helloworld/helloworld-monod-linux.dproj b/examples/helloworld/helloworld-monod-linux.dproj
index 102b1c48..5263855d 100644
--- a/examples/helloworld/helloworld-monod-linux.dproj
+++ b/examples/helloworld/helloworld-monod-linux.dproj
@@ -17,7 +17,6 @@
       <Includes>
         <Path>../../src</Path>
         <Path>../../3rdparty</Path>
-        <Path>../../deps/gl3n</Path>
         <Path>../../deps/DerelictSDL2/source</Path>
         <Path>../../deps/DerelictFT/source</Path>
         <Path>../../deps/DerelictGL3/source</Path>
diff --git a/examples/helloworld/helloworld-monod-osx.dproj b/examples/helloworld/helloworld-monod-osx.dproj
index 5631e19e..98eebf3c 100644
--- a/examples/helloworld/helloworld-monod-osx.dproj
+++ b/examples/helloworld/helloworld-monod-osx.dproj
@@ -12,7 +12,6 @@
       <Includes>
         <Path>../../src</Path>
         <Path>../../3rdparty</Path>
-        <Path>../../deps/gl3n</Path>
         <Path>../../deps/DerelictGL3/source</Path>
         <Path>../../deps/DerelictSDL2/source</Path>
         <Path>../../deps/DerelictFT/source</Path>
diff --git a/examples/helloworld/helloworld-monod-windows.dproj b/examples/helloworld/helloworld-monod-windows.dproj
index 40d029af..f3a8a771 100644
--- a/examples/helloworld/helloworld-monod-windows.dproj
+++ b/examples/helloworld/helloworld-monod-windows.dproj
@@ -15,12 +15,12 @@
     </DependentProjectIds>
     <Includes>
       <Includes>
-        <Path>..\..\src</Path>
-        <Path>..\..\deps\DerelictFT\source</Path>
-        <Path>..\..\deps\DerelictSDL2\source</Path>
-        <Path>..\..\deps\DerelictGL3\source</Path>
-        <Path>..\..\deps\DerelictUtil\source</Path>
-        <Path>..\..\deps\gl3n</Path>
+        <Path>../../src</Path>
+        <Path>../../3rdparty</Path>
+        <Path>../../deps/DerelictSDL2/source</Path>
+        <Path>../../deps/DerelictFT/source</Path>
+        <Path>../../deps/DerelictGL3/source</Path>
+        <Path>../../deps/DerelictUtil/source</Path>
       </Includes>
     </Includes>
   </PropertyGroup>
diff --git a/examples/tetris/tetris-monod-linux.dproj b/examples/tetris/tetris-monod-linux.dproj
index 4c13bc2e..2ba0ac52 100644
--- a/examples/tetris/tetris-monod-linux.dproj
+++ b/examples/tetris/tetris-monod-linux.dproj
@@ -12,7 +12,6 @@
       <Includes>
         <Path>../../src</Path>
         <Path>../../3rdparty</Path>
-        <Path>../../deps/gl3n</Path>
         <Path>../../deps/DerelictSDL2/source</Path>
         <Path>../../deps/DerelictFT/source</Path>
         <Path>../../deps/DerelictGL3/source</Path>
diff --git a/examples/tetris/tetris-monod-osx.dproj b/examples/tetris/tetris-monod-osx.dproj
index 89dc4e20..ac7cd829 100644
--- a/examples/tetris/tetris-monod-osx.dproj
+++ b/examples/tetris/tetris-monod-osx.dproj
@@ -17,7 +17,6 @@
       <Includes>
         <Path>../../src</Path>
         <Path>../../3rdparty</Path>
-        <Path>../../deps/gl3n</Path>
         <Path>../../deps/DerelictGL3/source</Path>
         <Path>../../deps/DerelictSDL2/source</Path>
         <Path>../../deps/DerelictFT/source</Path>
diff --git a/examples/tetris/tetris-monod-windows.dproj b/examples/tetris/tetris-monod-windows.dproj
index 45ced4fe..de7c9561 100644
--- a/examples/tetris/tetris-monod-windows.dproj
+++ b/examples/tetris/tetris-monod-windows.dproj
@@ -15,12 +15,12 @@
     </DependentProjectIds>
     <Includes>
       <Includes>
-        <Path>..\..\src</Path>
-        <Path>..\..\deps\DerelictFT\source</Path>
-        <Path>..\..\deps\DerelictSDL2\source</Path>
-        <Path>..\..\deps\DerelictGL3\source</Path>
-        <Path>..\..\deps\DerelictUtil\source</Path>
-        <Path>..\..\deps\gl3n</Path>
+        <Path>../../src</Path>
+        <Path>../../3rdparty</Path>
+        <Path>../../deps/DerelictSDL2/source</Path>
+        <Path>../../deps/DerelictFT/source</Path>
+        <Path>../../deps/DerelictGL3/source</Path>
+        <Path>../../deps/DerelictUtil/source</Path>
       </Includes>
     </Includes>
   </PropertyGroup>