From de37d14b049a98473c5963cdaf0ce035363809f5 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Wed, 4 May 2016 09:34:40 +0300
Subject: [PATCH] resolve module name conflict fontconfig/types.d and
 dlangui/core/types.d when building with ldmd2 on windows

---
 3rdparty/fontconfig/{types.d => fctypes.d}      | 2 +-
 3rdparty/fontconfig/functions.d                 | 2 +-
 3rdparty/fontconfig/package.d                   | 2 +-
 dlangui-monod-linux.dproj                       | 2 +-
 dlangui-monod-osx.dproj                         | 2 +-
 dlangui-monod-windows.dproj                     | 2 +-
 dlangui-msvc.visualdproj                        | 4 ++--
 examples/helloworld/helloworld-msvc.visualdproj | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename 3rdparty/fontconfig/{types.d => fctypes.d} (99%)

diff --git a/3rdparty/fontconfig/types.d b/3rdparty/fontconfig/fctypes.d
similarity index 99%
rename from 3rdparty/fontconfig/types.d
rename to 3rdparty/fontconfig/fctypes.d
index a9e7846a..0647d60a 100644
--- a/3rdparty/fontconfig/types.d
+++ b/3rdparty/fontconfig/fctypes.d
@@ -1,4 +1,4 @@
-module fontconfig.types;
+module fontconfig.fctypes;
 
 import std.string : toStringz, fromStringz, toLower;
 import std.algorithm : endsWith;
diff --git a/3rdparty/fontconfig/functions.d b/3rdparty/fontconfig/functions.d
index a543cc24..0aafd04c 100644
--- a/3rdparty/fontconfig/functions.d
+++ b/3rdparty/fontconfig/functions.d
@@ -1,6 +1,6 @@
 module fontconfig.functions;
 
-public import fontconfig.types;
+public import fontconfig.fctypes;
 
 
 extern( C ) @nogc nothrow {
diff --git a/3rdparty/fontconfig/package.d b/3rdparty/fontconfig/package.d
index d2860086..10fd02d2 100644
--- a/3rdparty/fontconfig/package.d
+++ b/3rdparty/fontconfig/package.d
@@ -1,6 +1,6 @@
 module fontconfig;
 
-public import fontconfig.types;
+public import fontconfig.fctypes;
 public import fontconfig.functions;
 
 private {
diff --git a/dlangui-monod-linux.dproj b/dlangui-monod-linux.dproj
index 48da5792..b9a0ee0d 100644
--- a/dlangui-monod-linux.dproj
+++ b/dlangui-monod-linux.dproj
@@ -361,7 +361,7 @@
     <Compile Include="deps\DerelictUtil\source\derelict\util\xtypes.d" />
     <Compile Include="3rdparty\fontconfig\functions.d" />
     <Compile Include="3rdparty\fontconfig\package.d" />
-    <Compile Include="3rdparty\fontconfig\types.d" />
+    <Compile Include="3rdparty\fontconfig\fctypes.d" />
     <Compile Include="deps\x11\source\x11\keysym.d" />
     <Compile Include="deps\x11\source\x11\keysymdef.d" />
     <Compile Include="deps\x11\source\x11\X.d" />
diff --git a/dlangui-monod-osx.dproj b/dlangui-monod-osx.dproj
index f5275a69..a9e7d8ff 100644
--- a/dlangui-monod-osx.dproj
+++ b/dlangui-monod-osx.dproj
@@ -209,7 +209,7 @@
     <Compile Include="src\dlangui\graphics\xpm\xpmcolors.d" />
     <Compile Include="3rdparty\fontconfig\functions.d" />
     <Compile Include="3rdparty\fontconfig\package.d" />
-    <Compile Include="3rdparty\fontconfig\types.d" />
+    <Compile Include="3rdparty\fontconfig\fctypes.d" />
     <Compile Include="src\dlangui\package.d" />
     <Compile Include="deps\DerelictCocoa\source\derelict\cocoa\appkit.d" />
     <Compile Include="deps\DerelictCocoa\source\derelict\cocoa\cocoa.d" />
diff --git a/dlangui-monod-windows.dproj b/dlangui-monod-windows.dproj
index b1c4bcce..c4f80550 100644
--- a/dlangui-monod-windows.dproj
+++ b/dlangui-monod-windows.dproj
@@ -224,7 +224,7 @@
     <Compile Include="3rdparty\win32\wtypes.d" />
     <Compile Include="3rdparty\fontconfig\functions.d" />
     <Compile Include="3rdparty\fontconfig\package.d" />
-    <Compile Include="3rdparty\fontconfig\types.d" />
+    <Compile Include="3rdparty\fontconfig\fctypes.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" />
diff --git a/dlangui-msvc.visualdproj b/dlangui-msvc.visualdproj
index 2fa39adf..3585625a 100644
--- a/dlangui-msvc.visualdproj
+++ b/dlangui-msvc.visualdproj
@@ -314,7 +314,7 @@
   <multiobj>0</multiobj>
   <singleFileCompilation>0</singleFileCompilation>
   <oneobj>0</oneobj>
-  <mscoff>0</mscoff>
+  <mscoff>1</mscoff>
   <trace>0</trace>
   <quiet>0</quiet>
   <verbose>0</verbose>
@@ -669,7 +669,7 @@
    <Folder name="fontconfig">
     <File path="3rdparty\fontconfig\functions.d" />
     <File path="3rdparty\fontconfig\package.d" />
-    <File path="3rdparty\fontconfig\types.d" />
+    <File path="3rdparty\fontconfig\fctypes.d" />
    </Folder>
    <Folder name="win32">
     <File path="3rdparty\win32\basetsd.d" />
diff --git a/examples/helloworld/helloworld-msvc.visualdproj b/examples/helloworld/helloworld-msvc.visualdproj
index 2a21fd55..ed0a7fec 100644
--- a/examples/helloworld/helloworld-msvc.visualdproj
+++ b/examples/helloworld/helloworld-msvc.visualdproj
@@ -218,7 +218,7 @@
   <verbose>0</verbose>
   <vtls>0</vtls>
   <vgc>0</vgc>
-  <symdebug>1</symdebug>
+  <symdebug>2</symdebug>
   <optimize>0</optimize>
   <cpu>0</cpu>
   <isX86_64>1</isX86_64>