diff --git a/dlangui-monod-osx.dproj b/dlangui-monod-osx.dproj index ffc3c6f7..c0665fd8 100644 --- a/dlangui-monod-osx.dproj +++ b/dlangui-monod-osx.dproj @@ -73,6 +73,24 @@ + + bin\DebugX11 + + + USE_X11 + USE_FREETYPE + EmbedStandardResources + + + obj/DebugX11 + true + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + false + libdlangui-monod-osx + StaticLibrary + true + 0 + @@ -211,5 +229,22 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dlangui-monod-osx.sln b/dlangui-monod-osx.sln index b6b8f3a0..16bd4b6a 100644 --- a/dlangui-monod-osx.sln +++ b/dlangui-monod-osx.sln @@ -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 diff --git a/examples/derelictcocoatest-monod-osx/derelictcocoatest-monod-osx.dproj b/examples/derelictcocoatest-monod-osx/derelictcocoatest-monod-osx.dproj index 67b8eda5..c02a4fbb 100644 --- a/examples/derelictcocoatest-monod-osx/derelictcocoatest-monod-osx.dproj +++ b/examples/derelictcocoatest-monod-osx/derelictcocoatest-monod-osx.dproj @@ -66,6 +66,16 @@ true 0 + + bin\DebugX11 + obj/DebugX11 + false + false + derelictcocoatest-monod-osx + Executable + true + 0 + diff --git a/examples/derelictcocoatest-monod-osx/src/cocoatest.d b/examples/derelictcocoatest-monod-osx/src/cocoatest.d index 430fc596..b45ea4c5 100644 --- a/examples/derelictcocoatest-monod-osx/src/cocoatest.d +++ b/examples/derelictcocoatest-monod-osx/src/cocoatest.d @@ -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), diff --git a/examples/dmledit/dmledit-monod-osx.dproj b/examples/dmledit/dmledit-monod-osx.dproj index 495f7ddb..91aa6a8c 100644 --- a/examples/dmledit/dmledit-monod-osx.dproj +++ b/examples/dmledit/dmledit-monod-osx.dproj @@ -84,6 +84,17 @@ true 0 + + bin\DebugX11 + obj/DebugX11 + false + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + false + dmledit-monod-osx + Executable + true + 0 + diff --git a/examples/example1/example1-monod-osx.dproj b/examples/example1/example1-monod-osx.dproj index 49517dbc..e6694f37 100644 --- a/examples/example1/example1-monod-osx.dproj +++ b/examples/example1/example1-monod-osx.dproj @@ -89,6 +89,26 @@ -v false + + bin\DebugX11 + + + USE_X11 + USE_FREETYPE + EmbedStandardResources + + + obj/DebugX11 + true + -L/usr/X11/lib -lX11 + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + false + example1-monod-osx + Executable + true + false + 0 + diff --git a/examples/helloworld/helloworld-monod-osx.dproj b/examples/helloworld/helloworld-monod-osx.dproj index 9f335f31..14cec4c4 100644 --- a/examples/helloworld/helloworld-monod-osx.dproj +++ b/examples/helloworld/helloworld-monod-osx.dproj @@ -79,6 +79,17 @@ true 0 + + bin\DebugX11 + obj/DebugX11 + false + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + false + helloworld-monod-osx + Executable + true + 0 + diff --git a/examples/spreadsheet/spreadsheet-monod-osx.dproj b/examples/spreadsheet/spreadsheet-monod-osx.dproj index 38b01486..e0010075 100644 --- a/examples/spreadsheet/spreadsheet-monod-osx.dproj +++ b/examples/spreadsheet/spreadsheet-monod-osx.dproj @@ -84,6 +84,17 @@ true 0 + + bin\DebugX11 + obj/DebugX11 + false + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + false + spreadsheet-monod-osx + Executable + true + 0 + diff --git a/examples/tetris/tetris-monod-osx.dproj b/examples/tetris/tetris-monod-osx.dproj index 55746155..1d5e9578 100644 --- a/examples/tetris/tetris-monod-osx.dproj +++ b/examples/tetris/tetris-monod-osx.dproj @@ -84,6 +84,17 @@ true 0 + + bin\DebugX11 + obj/DebugX11 + false + -Jviews -Jviews/res -Jviews/res/i18n -Jviews/res/mdpi -Jviews/res/hdpi + false + tetris-monod-osx + Executable + true + 0 +