2009-07-09 Jb Evain <jbevain@novell.com>

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

diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile
index 6acc12d632a323d1669774d9d27d7616af720ae7..801f450e33fe81e8319640fc2d786b6a97ee2ab6 100644 (file)
--- a/mcs/class/System.Core/Makefile
+++ b/mcs/class/System.Core/Makefile
@@ -1,13 +1,23 @@
-thisdir = class/System.Core\r
-SUBDIRS = \r
-include ../../build/rules.make\r
-\r
-LIBRARY = System.Core.dll\r
-LIB_MCS_FLAGS = /r:$(corlib)\r
-NO_TEST = yes\r
-
-# This is a .NET 2.0 only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0, $(PROFILE))
+thisdir = class/System.Core
+SUBDIRS = 
+include ../../build/rules.make
+
+LIBRARY = System.Core.dll
+
+LIB_MCS_FLAGS = -d:LIBC /r:$(corlib) /r:System
+
+ifneq (2.1, $(FRAMEWORK_VERSION))
+LIB_MCS_FLAGS += -d:NET_3_5 -nowarn:1720
+endif
+
+ifeq (4.0, $(FRAMEWORK_VERSION))
+LIB_MCS_FLAGS += -d:CODEPLEX_40
+endif
+
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
+
+# This is a .NET 2.0+ only assembly
+VALID_PROFILE := $(filter net_2_0 net_2_1_raw net_4_0, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Core.dll
 NO_INSTALL = yes
@@ -15,4 +25,5 @@ NO_SIGN_ASSEMBLY = yes
 NO_TEST = yes
 endif
 
-include ../../build/library.make\r
+include ../../build/library.make
+