Merge pull request #61 from ztzg/darwin-static-build-fixes

[mono.git] / mcs / class / System.Drawing / Makefile

diff --git a/mcs/class/System.Drawing/Makefile b/mcs/class/System.Drawing/Makefile
index ddebd69621a633f0e720ce9ae11040d77d42ff81..de2889f043fc04a5903451a9174a39d3e55d80e9 100644 (file)
--- a/mcs/class/System.Drawing/Makefile
+++ b/mcs/class/System.Drawing/Makefile
@@ -4,10 +4,14 @@ 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 \
+       -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
 
 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
+        -r:System.Drawing.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Xml.dll \
+       -nowarn:0618 -nowarn:219 -nowarn:169 -nowarn:1595
 
 ifeq (net_1_1_java, $(PROFILE))
 LIB_MCS_FLAGS +=                               \
@@ -20,6 +24,7 @@ include ../../build/library.make
 
 EXTRA_DISTFILES = Test/resources/indexed.png   \
        Test/System.Drawing/bitmaps/1bit.png    \
+       Test/System.Drawing/bitmaps/81674-2bpp.png      \
        Test/System.Drawing/bitmaps/4bit.png    \
        Test/System.Drawing/bitmaps/almogaver1bit.bmp   \
        Test/System.Drawing/bitmaps/almogaver24bits1.bmp        \
@@ -30,7 +35,33 @@ EXTRA_DISTFILES = Test/resources/indexed.png \
        Test/System.Drawing/bitmaps/almogaver-os2.bmp   \
        Test/System.Drawing/bitmaps/maketransparent.bmp \
        Test/System.Drawing/bitmaps/nature24bits.gif    \
+       Test/System.Drawing/bitmaps/nature24bits87.gif  \
+       Test/System.Drawing/bitmaps/81773-interlaced.gif        \
        Test/System.Drawing/bitmaps/nature24bits.jpg    \
+       Test/System.Drawing/bitmaps/nature-greyscale.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       \
+       Test/System.Drawing/bitmaps/16x16x16.ico        \
+       Test/System.Drawing/bitmaps/32x32x16.ico        \
+       Test/System.Drawing/bitmaps/48x48x1.ico \
+       Test/System.Drawing/bitmaps/64x64x256.ico       \
+       Test/System.Drawing/bitmaps/96x96x256.ico       \
+       Test/System.Drawing/bitmaps/32bpp.ico   \
+       Test/System.Drawing/bitmaps/80509.ico   \
+       Test/System.Drawing/bitmaps/323511.ico  \
+       Test/System.Drawing/bitmaps/415581.ico  \
+       Test/System.Drawing/bitmaps/non-inverted.bmp    \
+       Test/System.Drawing/bitmaps/milkmateya01.emf    \
+       Test/System.Drawing/bitmaps/telescope_01.wmf    \
+       Assembly/Application.ico        \
+       Assembly/Asterisk.ico           \
+       Assembly/Error.ico              \
+       Assembly/Exclamation.ico        \
+       Assembly/Hand.ico               \
+       Assembly/Information.ico        \
+       Assembly/Question.ico           \
+       Assembly/Warning.ico            \
+       Assembly/WinLogo.ico            \
+       Assembly/Mono.ico               \
+       nunit-host-ignore-list