From 24b0a4baec55138ee8f257dc7ad45f0533315f96 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <buggins@fromru.com>
Date: Wed, 14 Sep 2016 11:38:49 +0300
Subject: [PATCH] update mono-d linux project files

---
 dlangui-monod-linux.dproj                     | 27 ++++++++++++++++++-
 dlangui-monod-linux.sln                       | 13 +++++++++
 examples/dmledit/dmledit-monod-linux.dproj    | 16 +++++++++++
 examples/example1/example1-monod-linux.dproj  | 21 +++++++++++++++
 .../helloworld/helloworld-monod-linux.dproj   | 10 +++++++
 .../spreadsheet/spreadsheet-monod-linux.dproj | 16 +++++++++++
 examples/tetris/tetris-monod-linux.dproj      | 16 +++++++++++
 src/dlangui/platforms/console/consoleapp.d    |  2 +-
 8 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/dlangui-monod-linux.dproj b/dlangui-monod-linux.dproj
index adb6f623..29d66c2e 100644
--- a/dlangui-monod-linux.dproj
+++ b/dlangui-monod-linux.dproj
@@ -254,6 +254,27 @@
     <Externalconsole>true</Externalconsole>
     <DebugLevel>0</DebugLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugConsole|AnyCPU' ">
+    <OutputPath>bin\DebugConsole</OutputPath>
+    <ObjectsDirectory>obj/DebugConsole</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews
+-Jviews/res
+-Jviews/res/i18n
+-Jviews/res/shaders
+-Jviews/res/mdpi
+-Jviews/res/hdpi</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>libdlangui-monod-linux</OutputName>
+    <Target>StaticLibrary</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_CONSOLE</String>
+      </VersionIds>
+    </VersionIds>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\dlangui\core\collections.d" />
     <Compile Include="src\dlangui\core\css.d" />
@@ -284,7 +305,6 @@
     <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" />
     <Compile Include="src\dlangui\graphics\fonts.d" />
     <Compile Include="src\dlangui\graphics\ftfonts.d" />
     <Compile Include="src\dlangui\graphics\gldrawbuf.d" />
@@ -406,6 +426,11 @@
     <Compile Include="3rdparty\dimage\zlib.d" />
     <Compile Include="src\dlangui\core\asyncsocket.d" />
     <Compile Include="src\dlangui\core\queue.d" />
+    <Compile Include="src\dlangui\graphics\domrender\domrender.d" />
+    <Compile Include="src\dlangui\graphics\domrender\renderblock.d" />
+    <Compile Include="src\dlangui\platforms\console\consoleapp.d" />
+    <Compile Include="src\dlangui\platforms\console\consolefont.d" />
+    <Compile Include="src\dlangui\platforms\console\dconsole.d" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="src\dlangui\platforms\x11\" />
diff --git a/dlangui-monod-linux.sln b/dlangui-monod-linux.sln
index 68d9dc6b..5246b348 100644
--- a/dlangui-monod-linux.sln
+++ b/dlangui-monod-linux.sln
@@ -24,10 +24,13 @@ Global
 		DebugX11|Any CPU = DebugX11|Any CPU
 		ReleaseX11|Any CPU = ReleaseX11|Any CPU
 		UnittestX11|Any CPU = UnittestX11|Any CPU
+		DebugConsole|Any CPU = DebugConsole|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.Debug|Any CPU.Build.0 = Debug|x64
+		{075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.DebugConsole|Any CPU.ActiveCfg = DebugConsole|Any CPU
+		{075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.DebugConsole|Any CPU.Build.0 = DebugConsole|Any CPU
 		{075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64
 		{075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64
 		{075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64
@@ -46,6 +49,8 @@ Global
 		{075C374A-563A-4CAC-9E9F-0B6E1DFEAEC3}.UnittestX11|Any CPU.Build.0 = UnittestX11|x64
 		{0A3A0D08-E4DC-418E-B92B-561CC91C2306}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{0A3A0D08-E4DC-418E-B92B-561CC91C2306}.Debug|Any CPU.Build.0 = Debug|x64
+		{0A3A0D08-E4DC-418E-B92B-561CC91C2306}.DebugConsole|Any CPU.ActiveCfg = DebugConsole|Any CPU
+		{0A3A0D08-E4DC-418E-B92B-561CC91C2306}.DebugConsole|Any CPU.Build.0 = DebugConsole|Any CPU
 		{0A3A0D08-E4DC-418E-B92B-561CC91C2306}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64
 		{0A3A0D08-E4DC-418E-B92B-561CC91C2306}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64
 		{0A3A0D08-E4DC-418E-B92B-561CC91C2306}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64
@@ -64,6 +69,8 @@ Global
 		{0A3A0D08-E4DC-418E-B92B-561CC91C2306}.UnittestX11|Any CPU.Build.0 = UnittestX11|x64
 		{54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.Debug|Any CPU.Build.0 = Debug|x64
+		{54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.DebugConsole|Any CPU.ActiveCfg = DebugConsole|Any CPU
+		{54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.DebugConsole|Any CPU.Build.0 = DebugConsole|Any CPU
 		{54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64
 		{54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64
 		{54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64
@@ -82,6 +89,8 @@ Global
 		{54BDE028-6064-4CA9-B6CA-4C0BEEE70F24}.UnittestX11|Any CPU.Build.0 = UnittestX11|x64
 		{5BD82AA8-4026-44C2-8957-B4E2932542F0}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{5BD82AA8-4026-44C2-8957-B4E2932542F0}.Debug|Any CPU.Build.0 = Debug|x64
+		{5BD82AA8-4026-44C2-8957-B4E2932542F0}.DebugConsole|Any CPU.ActiveCfg = DebugConsole|Any CPU
+		{5BD82AA8-4026-44C2-8957-B4E2932542F0}.DebugConsole|Any CPU.Build.0 = DebugConsole|Any CPU
 		{5BD82AA8-4026-44C2-8957-B4E2932542F0}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64
 		{5BD82AA8-4026-44C2-8957-B4E2932542F0}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64
 		{5BD82AA8-4026-44C2-8957-B4E2932542F0}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64
@@ -100,6 +109,8 @@ Global
 		{5BD82AA8-4026-44C2-8957-B4E2932542F0}.UnittestX11|Any CPU.Build.0 = UnittestX11|x64
 		{8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.Debug|Any CPU.Build.0 = Debug|x64
+		{8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.DebugConsole|Any CPU.ActiveCfg = DebugConsole|Any CPU
+		{8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.DebugConsole|Any CPU.Build.0 = DebugConsole|Any CPU
 		{8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64
 		{8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64
 		{8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64
@@ -118,6 +129,8 @@ Global
 		{8E722D80-CF8D-4D98-BEAE-7BC9E6752AC4}.UnittestX11|Any CPU.Build.0 = UnittestX11|x64
 		{A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.Debug|Any CPU.Build.0 = Debug|x64
+		{A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.DebugConsole|Any CPU.ActiveCfg = DebugConsole|Any CPU
+		{A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.DebugConsole|Any CPU.Build.0 = DebugConsole|Any CPU
 		{A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.DebugMinimal|Any CPU.ActiveCfg = DebugMinimal|x64
 		{A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.DebugMinimal|Any CPU.Build.0 = DebugMinimal|x64
 		{A38BEF21-AAFE-4115-A978-63B7C8C2FBD1}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64
diff --git a/examples/dmledit/dmledit-monod-linux.dproj b/examples/dmledit/dmledit-monod-linux.dproj
index 2288281f..3d65c70b 100644
--- a/examples/dmledit/dmledit-monod-linux.dproj
+++ b/examples/dmledit/dmledit-monod-linux.dproj
@@ -244,6 +244,22 @@
     <DebugLevel>0</DebugLevel>
     <ExtraLinkerArguments>-lX11</ExtraLinkerArguments>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugConsole|AnyCPU' ">
+    <OutputPath>bin\DebugConsole</OutputPath>
+    <ObjectsDirectory>obj/DebugConsole</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews
+-Jviews/res
+-Jviews/res/hdpi
+-Jviews/res/mdpi
+-Jviews/res/i18n
+</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>dmledit-monod-linux</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\dmledit.d" />
   </ItemGroup>
diff --git a/examples/example1/example1-monod-linux.dproj b/examples/example1/example1-monod-linux.dproj
index cc8f53f6..32b56dcc 100644
--- a/examples/example1/example1-monod-linux.dproj
+++ b/examples/example1/example1-monod-linux.dproj
@@ -244,6 +244,27 @@
     <Externalconsole>true</Externalconsole>
     <DebugLevel>0</DebugLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugConsole|AnyCPU' ">
+    <OutputPath>bin\DebugConsole</OutputPath>
+    <ObjectsDirectory>obj/DebugConsole</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews
+-Jviews/res
+-Jviews/res/hdpi
+-Jviews/res/mdpi
+-Jviews/res/i18n
+</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>example1-monod-linux</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+    <VersionIds>
+      <VersionIds>
+        <String>USE_CONSOLE</String>
+      </VersionIds>
+    </VersionIds>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\example1.d" />
   </ItemGroup>
diff --git a/examples/helloworld/helloworld-monod-linux.dproj b/examples/helloworld/helloworld-monod-linux.dproj
index 5263855d..9495185f 100644
--- a/examples/helloworld/helloworld-monod-linux.dproj
+++ b/examples/helloworld/helloworld-monod-linux.dproj
@@ -187,6 +187,16 @@
     <Externalconsole>true</Externalconsole>
     <DebugLevel>0</DebugLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugConsole|AnyCPU' ">
+    <OutputPath>bin\DebugConsole</OutputPath>
+    <ObjectsDirectory>obj/DebugConsole</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>helloworld-monod-linux</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\helloworld.d" />
   </ItemGroup>
diff --git a/examples/spreadsheet/spreadsheet-monod-linux.dproj b/examples/spreadsheet/spreadsheet-monod-linux.dproj
index e5634004..31b6dcd0 100644
--- a/examples/spreadsheet/spreadsheet-monod-linux.dproj
+++ b/examples/spreadsheet/spreadsheet-monod-linux.dproj
@@ -243,6 +243,22 @@
     <DebugLevel>0</DebugLevel>
     <ObjectsDirectory>obj/UnittestX11</ObjectsDirectory>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugConsole|AnyCPU' ">
+    <OutputPath>bin\DebugConsole</OutputPath>
+    <ObjectsDirectory>obj/DebugConsole</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews
+-Jviews/res
+-Jviews/res/hdpi
+-Jviews/res/mdpi
+-Jviews/res/i18n
+</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>spreadsheet-monod-linux</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\spreadsheetapp.d" />
     <Compile Include="src\dlangui\widgets\spreadsheet.d" />
diff --git a/examples/tetris/tetris-monod-linux.dproj b/examples/tetris/tetris-monod-linux.dproj
index 2ba0ac52..1ca1b058 100644
--- a/examples/tetris/tetris-monod-linux.dproj
+++ b/examples/tetris/tetris-monod-linux.dproj
@@ -235,6 +235,22 @@
 -Jviews/res/hdpi
 -Jviews/res/mdpi
 -Jviews/res/i18n
+</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <OutputName>tetris-monod-linux</OutputName>
+    <Target>Executable</Target>
+    <Externalconsole>true</Externalconsole>
+    <DebugLevel>0</DebugLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugConsole|AnyCPU' ">
+    <OutputPath>bin\DebugConsole</OutputPath>
+    <ObjectsDirectory>obj/DebugConsole</ObjectsDirectory>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <ExtraCompilerArguments>-Jviews
+-Jviews/res
+-Jviews/res/hdpi
+-Jviews/res/mdpi
+-Jviews/res/i18n
 </ExtraCompilerArguments>
     <UnittestMode>false</UnittestMode>
     <OutputName>tetris-monod-linux</OutputName>
diff --git a/src/dlangui/platforms/console/consoleapp.d b/src/dlangui/platforms/console/consoleapp.d
index 567dd3a2..5cba1658 100644
--- a/src/dlangui/platforms/console/consoleapp.d
+++ b/src/dlangui/platforms/console/consoleapp.d
@@ -286,7 +286,7 @@ class ConsoleDrawBuf : DrawBuf {
             return dr + dg + db;
         }
     }
-    static if (Windows) {
+    version(Windows) {
         // windows color table
         static immutable RGB[16] CONSOLE_COLORS_RGB = [
             RGB(0,0,0),