forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve module name conflict fontconfig/types.d and dlangui/core/types.d when building with ldmd2 on windows

This commit is contained in:
Vadim Lopatin 2016-05-04 09:34:40 +03:00
parent 4e2addbcd0
commit de37d14b04
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/fontconfig/types.d → 3rdparty/fontconfig/fctypes.d vendored
View File

@ -1,4 +1,4 @@
module fontconfig.types; module fontconfig.fctypes;
import std.string : toStringz, fromStringz, toLower; import std.string : toStringz, fromStringz, toLower;
import std.algorithm : endsWith; import std.algorithm : endsWith;

2
3rdparty/fontconfig/functions.d vendored
View File

@ -1,6 +1,6 @@
module fontconfig.functions; module fontconfig.functions;
public import fontconfig.types; public import fontconfig.fctypes;
extern( C ) @nogc nothrow { extern( C ) @nogc nothrow {

2
3rdparty/fontconfig/package.d vendored
View File

@ -1,6 +1,6 @@
module fontconfig; module fontconfig;
public import fontconfig.types; public import fontconfig.fctypes;
public import fontconfig.functions; public import fontconfig.functions;
private { private {

2
dlangui-monod-linux.dproj
View File

@ -361,7 +361,7 @@
<Compile Include="deps\DerelictUtil\source\derelict\util\xtypes.d" /> <Compile Include="deps\DerelictUtil\source\derelict\util\xtypes.d" />
<Compile Include="3rdparty\fontconfig\functions.d" /> <Compile Include="3rdparty\fontconfig\functions.d" />
<Compile Include="3rdparty\fontconfig\package.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\keysym.d" />
<Compile Include="deps\x11\source\x11\keysymdef.d" /> <Compile Include="deps\x11\source\x11\keysymdef.d" />
<Compile Include="deps\x11\source\x11\X.d" /> <Compile Include="deps\x11\source\x11\X.d" />

2
dlangui-monod-osx.dproj
View File

@ -209,7 +209,7 @@
<Compile Include="src\dlangui\graphics\xpm\xpmcolors.d" /> <Compile Include="src\dlangui\graphics\xpm\xpmcolors.d" />
<Compile Include="3rdparty\fontconfig\functions.d" /> <Compile Include="3rdparty\fontconfig\functions.d" />
<Compile Include="3rdparty\fontconfig\package.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="src\dlangui\package.d" />
<Compile Include="deps\DerelictCocoa\source\derelict\cocoa\appkit.d" /> <Compile Include="deps\DerelictCocoa\source\derelict\cocoa\appkit.d" />
<Compile Include="deps\DerelictCocoa\source\derelict\cocoa\cocoa.d" /> <Compile Include="deps\DerelictCocoa\source\derelict\cocoa\cocoa.d" />

2
dlangui-monod-windows.dproj
View File

@ -224,7 +224,7 @@
<Compile Include="3rdparty\win32\wtypes.d" /> <Compile Include="3rdparty\win32\wtypes.d" />
<Compile Include="3rdparty\fontconfig\functions.d" /> <Compile Include="3rdparty\fontconfig\functions.d" />
<Compile Include="3rdparty\fontconfig\package.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="src\dlangui\package.d" />
<Compile Include="deps\DerelictFT\source\derelict\freetype\ft.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\functions.d" />

4
dlangui-msvc.visualdproj
View File

@ -314,7 +314,7 @@
<multiobj>0</multiobj> <multiobj>0</multiobj>
<singleFileCompilation>0</singleFileCompilation> <singleFileCompilation>0</singleFileCompilation>
<oneobj>0</oneobj> <oneobj>0</oneobj>
<mscoff>0</mscoff> <mscoff>1</mscoff>
<trace>0</trace> <trace>0</trace>
<quiet>0</quiet> <quiet>0</quiet>
<verbose>0</verbose> <verbose>0</verbose>
@ -669,7 +669,7 @@
<Folder name="fontconfig"> <Folder name="fontconfig">
<File path="3rdparty\fontconfig\functions.d" /> <File path="3rdparty\fontconfig\functions.d" />
<File path="3rdparty\fontconfig\package.d" /> <File path="3rdparty\fontconfig\package.d" />
<File path="3rdparty\fontconfig\types.d" /> <File path="3rdparty\fontconfig\fctypes.d" />
</Folder> </Folder>
<Folder name="win32"> <Folder name="win32">
<File path="3rdparty\win32\basetsd.d" /> <File path="3rdparty\win32\basetsd.d" />

2
examples/helloworld/helloworld-msvc.visualdproj
View File

@ -218,7 +218,7 @@
<verbose>0</verbose> <verbose>0</verbose>
<vtls>0</vtls> <vtls>0</vtls>
<vgc>0</vgc> <vgc>0</vgc>
<symdebug>1</symdebug> <symdebug>2</symdebug>
<optimize>0</optimize> <optimize>0</optimize>
<cpu>0</cpu> <cpu>0</cpu>
<isX86_64>1</isX86_64> <isX86_64>1</isX86_64>