From 21cf6bd401a222921b372c2dc47872fb72e599f5 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Sat, 26 Apr 2014 20:48:14 +0400
Subject: [PATCH] fix linux build, and build instructions

---
 README.md                        | 21 +++++++++++++--------
 dlanguilib.dproj                 | 11 ++++++++++-
 dlanguimonod.sln                 |  8 +-------
 examples/example1/example1.dproj | 11 ++++++++++-
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 77d27f28..c73d9d3f 100644
--- a/README.md
+++ b/README.md
@@ -106,19 +106,20 @@ Win32 builds
 
 Build and run using DUB:
 
-	git clone git@github.com:buggins/dlangui.git
-	cd dlangui
-	dub run dlangui:example1
+        git clone https://github.com/buggins/dlangui.git
+        cd dlangui
+        dub run dlangui:example1
 
 
 
 To develop using Visual-D, download sources for dlabgui and dependencies into some directory:
 
-	git clone git@github.com:buggins/dlangui.git
-	git clone https://github.com/DerelictOrg/DerelictUtil.git
-	git clone https://github.com/DerelictOrg/DerelictFT.git
-	git clone https://github.com/DerelictOrg/DerelictFI.git
-	git clone https://github.com/DerelictOrg/DerelictGL3.git
+        git clone https://github.com/buggins/dlangui.git
+        git clone https://github.com/DerelictOrg/DerelictUtil.git
+        git clone https://github.com/DerelictOrg/DerelictGL3.git
+        git clone https://github.com/DerelictOrg/DerelictFI.git
+        git clone https://github.com/DerelictOrg/DerelictFT.git
+        git clone https://github.com/DerelictOrg/DerelictSDL2.git
 
 Then open .sln using Visual D.
 
@@ -140,6 +141,10 @@ To build dlangui apps, development packages for following libraries required:
 
         xcb, xcb-util, xcb-shm, xcb-image, xcb-keysyms, X11-xcb, X11
 
+E.g. in Ubuntu, you can use:
+
+        sudo apt-get install libxcb-image0-dev libxcb-shm0-dev libxcb-keysyms1-dev libfreeimage-dev
+
 In runtime, .so for following libraries are being loaded (binary packages required):
 
         freetype, opengl, freeimage
diff --git a/dlanguilib.dproj b/dlanguilib.dproj
index 2a25ae70..705aba3a 100644
--- a/dlanguilib.dproj
+++ b/dlanguilib.dproj
@@ -9,7 +9,7 @@
     <UseDefaultCompiler>true</UseDefaultCompiler>
     <IncrementalLinking>true</IncrementalLinking>
     <PreferOneStepBuild>true</PreferOneStepBuild>
-    <Compiler>DMD</Compiler>
+    <Compiler>DMD2</Compiler>
     <Includes>
       <Includes>
         <Path>/home/lve/src/d/DerelictFT/source</Path>
@@ -30,6 +30,9 @@
     <Target>StaticLibrary</Target>
     <ExtraCompilerArguments>-version=USE_OPENGL
 </ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <DebugLevel>0</DebugLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release</OutputPath>
@@ -38,6 +41,9 @@
     <Externalconsole>true</Externalconsole>
     <Target>StaticLibrary</Target>
     <ExtraCompilerArguments>-version=USE_OPENGL</ExtraCompilerArguments>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <DebugLevel>0</DebugLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -47,6 +53,9 @@
     <OutputName>dlanguilib</OutputName>
     <Externalconsole>true</Externalconsole>
     <Target>StaticLibrary</Target>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <DebugLevel>0</DebugLevel>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\dlangui\core\logger.d" />
diff --git a/dlanguimonod.sln b/dlanguimonod.sln
index 7c2693bd..6dcd0a98 100644
--- a/dlanguimonod.sln
+++ b/dlanguimonod.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "dlanguilib", "dlanguilib.dproj", "{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}"
 EndProject
-Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7D}") = "example1", "examples\example1\example1.dproj", "{440816C8-DBD6-454C-A0D7-B6E59CA1ED87}"
+Project("{3947E667-4C90-4C3A-BEB9-7148D6FE0D7C}") = "example1", "examples\example1\example1.dproj", "{440816C8-DBD6-454C-A0D7-B6E59CA1ED87}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,16 +13,10 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Release|Any CPU.Build.0 = Release|Any CPU
 		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Release|Any CPU.Build.0 = Release|Any CPU
 		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
-		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
 		{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
diff --git a/examples/example1/example1.dproj b/examples/example1/example1.dproj
index 50169e77..f1e04369 100644
--- a/examples/example1/example1.dproj
+++ b/examples/example1/example1.dproj
@@ -14,7 +14,7 @@
         <String>{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}</String>
       </DependentProjectIds>
     </DependentProjectIds>
-    <Compiler>DMD</Compiler>
+    <Compiler>DMD2</Compiler>
     <Includes>
       <Includes>
         <Path>/home/lve/src/d/dlangui/src</Path>
@@ -34,6 +34,9 @@
     <ObjectsDirectory>obj/Debug</ObjectsDirectory>
     <Externalconsole>true</Externalconsole>
     <Target>Executable</Target>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <DebugLevel>0</DebugLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>bin\Release</OutputPath>
@@ -41,6 +44,9 @@
     <ObjectsDirectory>obj/Release</ObjectsDirectory>
     <Externalconsole>true</Externalconsole>
     <Target>Executable</Target>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <DebugLevel>0</DebugLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unittest|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,6 +56,9 @@
     <OutputName>dlanguilib</OutputName>
     <Externalconsole>true</Externalconsole>
     <Target>Executable</Target>
+    <UnittestMode>false</UnittestMode>
+    <LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
+    <DebugLevel>0</DebugLevel>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\main.d" />