Update Makefile to add icon resources for SystemIcons (some icons needs to be updated...

svn path=/trunk/mcs/; revision=68883

diff --git a/mcs/class/System.Drawing/ChangeLog b/mcs/class/System.Drawing/ChangeLog
index 7855babaa3f7eb8b21949e3d7b187510c922685f..9aff67dce18ebe6e62c05230231b8d6f91383cd5 100644 (file)
--- a/mcs/class/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/ChangeLog
@@ -1,3 +1,13 @@
+2006-12-02  Sebastien Pouliot  <sebastien@ximian.com> 
+
+       * error.ico: New. Error icon required for SystemIcons.
+       * information.ico: New. Information icon required for SystemIcons.
+       * mono.ico: New. Mono icon used for Application and WinLogo in 
+       SystemIcons.
+       * question.ico: New. Question icon required for SystemIcons.
+       * warning.ico: New. Warning icon required for SystemIcons.
+       * Makefile: Add all icons as resources in the assembly.
+
 2006-11-16  Carlos Alberto Cortez <calberto.cortez@gmail.com>
 
        * System.Drawing_test.dll.sources: Add new unit test

diff --git a/mcs/class/System.Drawing/Makefile b/mcs/class/System.Drawing/Makefile
index ddebd69621a633f0e720ce9ae11040d77d42ff81..82d56d529307b4bc19ac455eae292e62fd9f60ef 100644 (file)
--- a/mcs/class/System.Drawing/Makefile
+++ b/mcs/class/System.Drawing/Makefile
@@ -4,7 +4,10 @@ SUBDIRS =
 
 LIBRARY = System.Drawing.dll
 
-LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll /nowarn:649 /nowarn:169
+LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll /nowarn:649 /nowarn:169 \
+       -resource:mono.ico,mono.ico -resource:information.ico,information.ico \
+       -resource:error.ico,error.ico -resource:warning.ico,warning.ico \
+       -resource:question.ico,question.ico
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -define:TEST -resource:Test/resources/indexed.png,indexed.png \
         /r:System.Drawing.dll -nowarn:0618 -nowarn:219 -nowarn:169 -nowarn:1595
@@ -33,4 +36,9 @@ EXTRA_DISTFILES = Test/resources/indexed.png  \
        Test/System.Drawing/bitmaps/nature24bits.jpg    \
        Test/System.Drawing/bitmaps/smiley.ico  \
        Test/System.Drawing/bitmaps/VisualPng1.ico      \
-       Test/System.Drawing/bitmaps/VisualPng.ico
+       Test/System.Drawing/bitmaps/VisualPng.ico       \
+       error.ico \
+       information.ico \
+       mono.ico        \
+       question.ico    \
+       warning.ico

diff --git a/mcs/class/System.Drawing/error.ico b/mcs/class/System.Drawing/error.ico
new file mode 100644 (file)
index 0000000..31b1077
Binary files /dev/null and b/mcs/class/System.Drawing/error.ico differ

diff --git a/mcs/class/System.Drawing/information.ico b/mcs/class/System.Drawing/information.ico
new file mode 100644 (file)
index 0000000..31b1077
Binary files /dev/null and b/mcs/class/System.Drawing/information.ico differ

diff --git a/mcs/class/System.Drawing/mono.ico b/mcs/class/System.Drawing/mono.ico
new file mode 100644 (file)
index 0000000..31b1077
Binary files /dev/null and b/mcs/class/System.Drawing/mono.ico differ

diff --git a/mcs/class/System.Drawing/question.ico b/mcs/class/System.Drawing/question.ico
new file mode 100644 (file)
index 0000000..31b1077
Binary files /dev/null and b/mcs/class/System.Drawing/question.ico differ

diff --git a/mcs/class/System.Drawing/warning.ico b/mcs/class/System.Drawing/warning.ico
new file mode 100644 (file)
index 0000000..31b1077
Binary files /dev/null and b/mcs/class/System.Drawing/warning.ico differ