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

monod-osx projects update for X11 build

This commit is contained in:
Vadim Lopatin 2015-12-02 21:35:09 +03:00
parent c3cd93fa51
commit acc57df9e6
9 changed files with 127 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlangui-monod-osx.dproj
View File

@ -73,6 +73,24 @@
</VersionIds>
</VersionIds>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugX11|x64' ">
<OutputPath>bin\DebugX11</OutputPath>
<VersionIds>
<VersionIds>
<String>USE_X11</String>
<String>USE_FREETYPE</String>
<String>EmbedStandardResources</String>
</VersionIds>
</VersionIds>
<ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
<LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
<ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode>
<OutputName>libdlangui-monod-osx</OutputName>
<Target>StaticLibrary</Target>
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="src\dlangui\core\collections.d" />
<Compile Include="src\dlangui\core\editable.d" />
@ -211,5 +229,22 @@
<Compile Include="deps\DerelictCocoa\source\derelict\cocoa\package.d" />
<Compile Include="deps\DerelictCocoa\source\derelict\cocoa\runtime.d" />
<Compile Include="src\dlangui\platforms\common\startup.d" />
<Compile Include="src\dlangui\platforms\x11\x11app.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" />
<Compile Include="deps\x11\source\x11\Xatom.d" />
<Compile Include="deps\x11\source\x11\Xlib_xcb.d" />
<Compile Include="deps\x11\source\x11\Xlib.d" />
<Compile Include="deps\x11\source\x11\XlibConf.d" />
<Compile Include="deps\x11\source\x11\Xlibint.d" />
<Compile Include="deps\x11\source\x11\Xmd.d" />
<Compile Include="deps\x11\source\x11\Xproto_undef.d" />
<Compile Include="deps\x11\source\x11\Xproto.d" />
<Compile Include="deps\x11\source\x11\Xprotostr.d" />
<Compile Include="deps\x11\source\x11\Xregion.d" />
<Compile Include="deps\x11\source\x11\Xresource.d" />
<Compile Include="deps\x11\source\x11\Xtos.d" />
<Compile Include="deps\x11\source\x11\Xutil.d" />
</ItemGroup>
</Project>

15
dlangui-monod-osx.sln
View File

@ -20,46 +20,61 @@ Global
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Unittest|Any CPU = Unittest|Any CPU
DebugX11|Any CPU = DebugX11|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Debug|Any CPU.ActiveCfg = Debug|x64
{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Debug|Any CPU.Build.0 = Debug|x64
{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64
{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.DebugX11|Any CPU.Build.0 = DebugX11|x64
{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Release|Any CPU.ActiveCfg = Release|x64
{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Release|Any CPU.Build.0 = Release|x64
{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Unittest|Any CPU.ActiveCfg = Unittest|x64
{079F4963-E637-4E8F-9EB3-BDC404F9DC1D}.Unittest|Any CPU.Build.0 = Unittest|x64
{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Debug|Any CPU.ActiveCfg = Debug|x64
{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Debug|Any CPU.Build.0 = Debug|x64
{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.DebugX11|Any CPU.ActiveCfg = DebugX11|Any CPU
{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.DebugX11|Any CPU.Build.0 = DebugX11|Any CPU
{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Release|Any CPU.ActiveCfg = Release|x64
{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Release|Any CPU.Build.0 = Release|x64
{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Unittest|Any CPU.ActiveCfg = Unittest|x64
{07ECE815-C4C3-4CDB-A60C-2E304EAAA2C7}.Unittest|Any CPU.Build.0 = Unittest|x64
{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Debug|Any CPU.ActiveCfg = Debug|x64
{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Debug|Any CPU.Build.0 = Debug|x64
{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.DebugX11|Any CPU.ActiveCfg = DebugX11|x64
{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.DebugX11|Any CPU.Build.0 = DebugX11|x64
{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Release|Any CPU.ActiveCfg = Release|x64
{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Release|Any CPU.Build.0 = Release|x64
{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Unittest|Any CPU.ActiveCfg = Unittest|x64
{1CC7C43E-7B39-4AFC-A45B-F1D9F582CF6D}.Unittest|Any CPU.Build.0 = Unittest|x64
{1F050D82-5245-4B51-A554-473194EA0DE9}.Debug|Any CPU.ActiveCfg = Debug|x64
{1F050D82-5245-4B51-A554-473194EA0DE9}.Debug|Any CPU.Build.0 = Debug|x64
{1F050D82-5245-4B51-A554-473194EA0DE9}.DebugX11|Any CPU.ActiveCfg = DebugX11|Any CPU
{1F050D82-5245-4B51-A554-473194EA0DE9}.DebugX11|Any CPU.Build.0 = DebugX11|Any CPU
{1F050D82-5245-4B51-A554-473194EA0DE9}.Release|Any CPU.ActiveCfg = Debug|x64
{1F050D82-5245-4B51-A554-473194EA0DE9}.Release|Any CPU.Build.0 = Debug|x64
{1F050D82-5245-4B51-A554-473194EA0DE9}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
{1F050D82-5245-4B51-A554-473194EA0DE9}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Debug|Any CPU.ActiveCfg = Debug|x64
{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Debug|Any CPU.Build.0 = Debug|x64
{8E3B1C65-63A3-4BD8-9268-604EE648E861}.DebugX11|Any CPU.ActiveCfg = DebugX11|Any CPU
{8E3B1C65-63A3-4BD8-9268-604EE648E861}.DebugX11|Any CPU.Build.0 = DebugX11|Any CPU
{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Release|Any CPU.ActiveCfg = Release|x64
{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Release|Any CPU.Build.0 = Release|x64
{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Unittest|Any CPU.ActiveCfg = Unittest|x64
{8E3B1C65-63A3-4BD8-9268-604EE648E861}.Unittest|Any CPU.Build.0 = Unittest|x64
{AAC53A3B-44F0-4597-8074-F92021F63654}.Debug|Any CPU.ActiveCfg = Debug|x64
{AAC53A3B-44F0-4597-8074-F92021F63654}.Debug|Any CPU.Build.0 = Debug|x64
{AAC53A3B-44F0-4597-8074-F92021F63654}.DebugX11|Any CPU.ActiveCfg = DebugX11|Any CPU
{AAC53A3B-44F0-4597-8074-F92021F63654}.DebugX11|Any CPU.Build.0 = DebugX11|Any CPU
{AAC53A3B-44F0-4597-8074-F92021F63654}.Release|Any CPU.ActiveCfg = Release|x64
{AAC53A3B-44F0-4597-8074-F92021F63654}.Release|Any CPU.Build.0 = Release|x64
{AAC53A3B-44F0-4597-8074-F92021F63654}.Unittest|Any CPU.ActiveCfg = Unittest|Any CPU
{AAC53A3B-44F0-4597-8074-F92021F63654}.Unittest|Any CPU.Build.0 = Unittest|Any CPU
{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Debug|Any CPU.ActiveCfg = Debug|x64
{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Debug|Any CPU.Build.0 = Debug|x64
{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.DebugX11|Any CPU.ActiveCfg = DebugX11|Any CPU
{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.DebugX11|Any CPU.Build.0 = DebugX11|Any CPU
{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Release|Any CPU.ActiveCfg = Release|x64
{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Release|Any CPU.Build.0 = Release|x64
{CB4E43FF-5E6A-4F4E-9A6C-F182EC258112}.Unittest|Any CPU.ActiveCfg = Unittest|x64

10
examples/derelictcocoatest-monod-osx/derelictcocoatest-monod-osx.dproj
View File

@ -66,6 +66,16 @@
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugX11|AnyCPU' ">
<OutputPath>bin\DebugX11</OutputPath>
<ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
<LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
<UnittestMode>false</UnittestMode>
<OutputName>derelictcocoatest-monod-osx</OutputName>
<Target>Executable</Target>
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<ItemGroup>
<Folder Include="src\" />
</ItemGroup>

4
examples/derelictcocoatest-monod-osx/src/cocoatest.d
View File

@ -199,6 +199,7 @@ public:
window.makeKeyAndOrderFront();
parentView = window.contentView();
//parentView.
_cocoaApplication.activateIgnoringOtherApps(YES);
}
@ -425,8 +426,9 @@ private:
_drawBuf.fillRect(Rect(20, 20, 120, 120), 0xFFBBBB);
size_t sizeNeeded = byteStride(_width) * _height;
//_imageData = NSData.dataWithBytesNoCopy(cast(ubyte*)_drawBuf.scanLine(0), sizeNeeded, false);
_imageData = NSData.dataWithBytesNoCopy(cast(ubyte*)_drawBuf.scanLine(0), sizeNeeded, false);
CIImage image = CIImage.imageWithBitmapData(_imageData,
byteStride(_drawBuf.width),
CGSize(_drawBuf.width, _drawBuf.height),

11
examples/dmledit/dmledit-monod-osx.dproj
View File

@ -84,6 +84,17 @@
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugX11|AnyCPU' ">
<OutputPath>bin\DebugX11</OutputPath>
<ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
<LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
<ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode>
<OutputName>dmledit-monod-osx</OutputName>
<Target>Executable</Target>
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="src\dmledit.d" />
</ItemGroup>

20
examples/example1/example1-monod-osx.dproj
View File

@ -89,6 +89,26 @@
<ExtraLinkerArguments>-v</ExtraLinkerArguments>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugX11|x64' ">
<OutputPath>bin\DebugX11</OutputPath>
<VersionIds>
<VersionIds>
<String>USE_X11</String>
<String>USE_FREETYPE</String>
<String>EmbedStandardResources</String>
</VersionIds>
</VersionIds>
<ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
<LinkinThirdPartyLibraries>true</LinkinThirdPartyLibraries>
<ExtraLinkerArguments>-L/usr/X11/lib -lX11</ExtraLinkerArguments>
<ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode>
<OutputName>example1-monod-osx</OutputName>
<Target>Executable</Target>
<Externalconsole>true</Externalconsole>
<ConsolePause>false</ConsolePause>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="src\example1.d" />
</ItemGroup>

11
examples/helloworld/helloworld-monod-osx.dproj
View File

@ -79,6 +79,17 @@
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugX11|AnyCPU' ">
<OutputPath>bin\DebugX11</OutputPath>
<ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
<LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
<ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode>
<OutputName>helloworld-monod-osx</OutputName>
<Target>Executable</Target>
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="src\helloworld.d" />
</ItemGroup>

11
examples/spreadsheet/spreadsheet-monod-osx.dproj
View File

@ -84,6 +84,17 @@
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugX11|AnyCPU' ">
<OutputPath>bin\DebugX11</OutputPath>
<ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
<LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
<ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode>
<OutputName>spreadsheet-monod-osx</OutputName>
<Target>Executable</Target>
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="src\spreadsheetapp.d" />
<Compile Include="src\dlangui\widgets\spreadsheet.d" />

11
examples/tetris/tetris-monod-osx.dproj
View File

@ -84,6 +84,17 @@
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugX11|AnyCPU' ">
<OutputPath>bin\DebugX11</OutputPath>
<ObjectsDirectory>obj/DebugX11</ObjectsDirectory>
<LinkinThirdPartyLibraries>false</LinkinThirdPartyLibraries>
<ExtraCompilerArguments>-Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi</ExtraCompilerArguments>
<UnittestMode>false</UnittestMode>
<OutputName>tetris-monod-osx</OutputName>
<Target>Executable</Target>
<Externalconsole>true</Externalconsole>
<DebugLevel>0</DebugLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="src\gui.d" />
<Compile Include="src\model.d" />