diff options
| author | Marek Safar <marek.safar@gmail.com> | 2016-12-19 18:35:23 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2016-12-19 18:36:39 +0300 |
| commit | 3daf6b7ca1e79c1c25aa7d3171f32f8808df8d46 (patch) | |
| tree | f68b30ae399b0b034e87c62c90eb2d4ca7dbb1b4 /mcs/class/System.Drawing | |
| parent | 5247fa62ed2d68076c63c6e7260a3a35dd88101f (diff) | |
[build] Add new profile
Diffstat (limited to 'mcs/class/System.Drawing')
| -rw-r--r-- | mcs/class/System.Drawing/Makefile | 8 | ||||
| -rw-r--r-- | mcs/class/System.Drawing/System.Drawing/Color.cs | 2 | ||||
| -rw-r--r-- | mcs/class/System.Drawing/System.Drawing/KnownColors.cs | 2 | ||||
| -rw-r--r-- | mcs/class/System.Drawing/netstandard.sources | 10 | ||||
| -rw-r--r-- | mcs/class/System.Drawing/xbox_System.Drawing.dll.sources | 3 |
5 files changed, 22 insertions, 3 deletions
diff --git a/mcs/class/System.Drawing/Makefile b/mcs/class/System.Drawing/Makefile index e815bbf4afb..7ccc1dcd83c 100644 --- a/mcs/class/System.Drawing/Makefile +++ b/mcs/class/System.Drawing/Makefile @@ -5,11 +5,17 @@ SUBDIRS = LIBRARY = System.Drawing.dll LIB_REFS = System -LIB_MCS_FLAGS = /unsafe -d:FEATURE_TYPECONVERTER \ +LIB_MCS_FLAGS = /unsafe \ -resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico \ -resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico \ -resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico +ifneq (xbox, $(PROFILE)) +LIB_MCS_FLAGS += -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS +else +LIB_MCS_FLAGS += /keyfile:../msfinal.pub +endif + TEST_LIB_REFS = System.Drawing System.Runtime.Serialization.Formatters.Soap System.Xml TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -define:TEST -resource:Test/resources/indexed.png,indexed.png \ diff --git a/mcs/class/System.Drawing/System.Drawing/Color.cs b/mcs/class/System.Drawing/System.Drawing/Color.cs index 6e72b0ecb69..31b4842c845 100644 --- a/mcs/class/System.Drawing/System.Drawing/Color.cs +++ b/mcs/class/System.Drawing/System.Drawing/Color.cs @@ -38,7 +38,7 @@ using System.Runtime.InteropServices; namespace System.Drawing { -#if !MONOTOUCH && !MONOMAC +#if !MONOTOUCH && !MONOMAC && FEATURE_TYPECONVERTER [TypeConverter(typeof(ColorConverter))] [Editor ("System.Drawing.Design.ColorEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))] #endif diff --git a/mcs/class/System.Drawing/System.Drawing/KnownColors.cs b/mcs/class/System.Drawing/System.Drawing/KnownColors.cs index 0440d8e3059..77b1b16251d 100644 --- a/mcs/class/System.Drawing/System.Drawing/KnownColors.cs +++ b/mcs/class/System.Drawing/System.Drawing/KnownColors.cs @@ -210,7 +210,7 @@ namespace System.Drawing { 0xFF316AC5, /* 174 - MenuHighlight */ }; -#if !MONOTOUCH && !MONOMAC +#if !MONOTOUCH && !MONOMAC && SUPPORTS_WINDOWS_COLORS static KnownColors () { if (GDIPlus.RunningOnWindows ()) { diff --git a/mcs/class/System.Drawing/netstandard.sources b/mcs/class/System.Drawing/netstandard.sources new file mode 100644 index 00000000000..809285b4854 --- /dev/null +++ b/mcs/class/System.Drawing/netstandard.sources @@ -0,0 +1,10 @@ +System.Drawing/Color.cs +System.Drawing/KnownColor.cs +System.Drawing/KnownColors.cs +System.Drawing/Point.cs +System.Drawing/PointF.cs +System.Drawing/Rectangle.cs +System.Drawing/RectangleF.cs +System.Drawing/Size.cs +System.Drawing/SizeF.cs + diff --git a/mcs/class/System.Drawing/xbox_System.Drawing.dll.sources b/mcs/class/System.Drawing/xbox_System.Drawing.dll.sources new file mode 100644 index 00000000000..c7c763e880b --- /dev/null +++ b/mcs/class/System.Drawing/xbox_System.Drawing.dll.sources @@ -0,0 +1,3 @@ +Assembly/AssemblyInfo.cs +../../build/common/Consts.cs +#include netstandard.sources
\ No newline at end of file |