New test.

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

diff --git a/mcs/class/System.Drawing/Makefile b/mcs/class/System.Drawing/Makefile
index 99122d5b3adf5532e726de3bb40785777fdfc348..ddebd69621a633f0e720ce9ae11040d77d42ff81 100644 (file)
--- a/mcs/class/System.Drawing/Makefile
+++ b/mcs/class/System.Drawing/Makefile
@@ -1,18 +1,36 @@
 thisdir = class/System.Drawing
 include ../../build/rules.make
-ifeq ($(PLATFORM),win32)
 SUBDIRS = 
-else
-SUBDIRS = gdiplus 
-endif
-
-# to use JPEG decoder add -r ./cdeclRedirector/cdeclCallback.dll 
-# and remove -define:DECLARE_CDECL_DELEGATES
-# cdeclCallback.dll should be manually copied to library folder
 
 LIBRARY = System.Drawing.dll
-LIB_MCS_FLAGS = /unsafe /define:DECLARE_CDECL_DELEGATES /r:$(corlib) \
-               /r:System.dll /nowarn:649 /nowarn:169
-NO_TEST = yes
+
+LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll /nowarn:649 /nowarn:169
+
+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
+
+ifeq (net_1_1_java, $(PROFILE))
+LIB_MCS_FLAGS +=                               \
+       -r:System.Xml.dll                       \
+       -r:rt.dll                               \
+       -r:J2SE.Helpers.dll
+endif
 
 include ../../build/library.make
+
+EXTRA_DISTFILES = Test/resources/indexed.png   \
+       Test/System.Drawing/bitmaps/1bit.png    \
+       Test/System.Drawing/bitmaps/4bit.png    \
+       Test/System.Drawing/bitmaps/almogaver1bit.bmp   \
+       Test/System.Drawing/bitmaps/almogaver24bits1.bmp        \
+       Test/System.Drawing/bitmaps/almogaver24bits.bmp \
+       Test/System.Drawing/bitmaps/almogaver32bits.bmp \
+       Test/System.Drawing/bitmaps/almogaver32bits.tif \
+       Test/System.Drawing/bitmaps/almogaver8bits.bmp  \
+       Test/System.Drawing/bitmaps/almogaver-os2.bmp   \
+       Test/System.Drawing/bitmaps/maketransparent.bmp \
+       Test/System.Drawing/bitmaps/nature24bits.gif    \
+       Test/System.Drawing/bitmaps/nature24bits.jpg    \
+       Test/System.Drawing/bitmaps/smiley.ico  \
+       Test/System.Drawing/bitmaps/VisualPng1.ico      \
+       Test/System.Drawing/bitmaps/VisualPng.ico