[m-rev.] diff: .NET scripts fixes.

[Tyson Dowd]

Hi,

Here are a few fixes that remove some of the annoying warning messages
when building .NET code.  I'll commit now and fix later.

===================================================================


Estimated hours taken: 0.5
Branches: main

A few fixes for the scripts in the .NET backend.	


scripts/Mmake.rules:
	Use -CLR instead of -com+, the latter is undocumented, confusing and
	may stop working in the future.

scripts/Mmake.vars.in:
	Remove the reference to the .NET libraries as these are no longer
	needed when using the command line C++ compiler cl.
	Remove ALL_CFLAGS from the CLFLAGS -- the wrong flags were being
	passed to cl (such as the -g flag) which it didn't understand.



Index: scripts/Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.92
diff -u -r1.92 Mmake.rules
--- scripts/Mmake.rules	2001/03/16 01:40:41	1.92
+++ scripts/Mmake.rules	2001/04/25 15:13:42
@@ -215,7 +215,7 @@
 ifeq ($(findstring il,$(GRADE)),il)        
 $(os_subdir)%.dll : %.cpp
 	rm -f $(os_subdir)$*.dll
-	$(MS_CL) -com+$(MS_CL_NOASM) -I$(MERC_C_INCL_DIR) \
+	$(MS_CL) -CLR$(MS_CL_NOASM) -I$(MERC_C_INCL_DIR) \
 		-I$(MERC_DLL_DIR) $(ALL_MS_CLFLAGS) $< -link -noentry \
 		-dll $(MS_CL_LIBS) -out:$@
 
@@ -340,13 +340,12 @@
 
 .il.exe:
 	$(MS_ILASM) $(ALL_MS_ILASMFLAGS) /quiet /OUT=$@ $< 
-	cp default.cfg $*.cfg
 
 .cpp.dll:
-	$(MS_CL) -com+($MS_CL_NOASM) -I$(MERCURY_LIBRARY_PATH) $< -link -noentry -dll $(MS_CL_LIBS) -out:$@
+	$(MS_CL) -CLR($MS_CL_NOASM) -I$(MERCURY_LIBRARY_PATH) $< -link -noentry -dll $(MS_CL_LIBS) -out:$@
 
 .cpp.exe:
-	$(MS_CL) -com+($MS_CL_NOASM) -I$(MERCURY_LIBRARY_PATH) $< -link -entry:main $(MS_CL_LIBS) -out:$@
+	$(MS_CL) -CLR($MS_CL_NOASM) -I$(MERCURY_LIBRARY_PATH) $< -link -entry:main $(MS_CL_LIBS) -out:$@
 
 endif # $(findstring il,$(GRADE)) != ""
 
Index: scripts/Mmake.vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.40
diff -u -r1.40 Mmake.vars.in
--- scripts/Mmake.vars.in	2001/01/23 16:12:56	1.40
+++ scripts/Mmake.vars.in	2001/04/25 15:13:42
@@ -144,7 +144,7 @@
 # use to compile Managed C++ code in the .NET backend.
 MS_CL		= cl
 ALL_MS_CLFLAGS	= $(MS_CLFLAGS) $(EXTRA_MS_CLFLAGS) $(TARGET_MS_CLFLAGS) \
-		$(LIB_MS_CLFLAGS) $(ALL_CFLAGS)
+		$(LIB_MS_CLFLAGS)
 MS_CLFLAGS	=
 EXTRA_MS_CLFLAGS =
 LIB_MS_CLFLAGS	= $(patsubst %,-I %,$(EXTRA_C_INCL_DIRS))
@@ -153,9 +153,8 @@
 # MS_CL_NOASM=:noAssembly to turn it off, leave it blank to turn it on.
 MS_CL_NOASM	=
 MS_DOTNET_SDK_DIR=@MS_DOTNET_SDK_DIR@
-# The system libraries.
-MS_CL_LIBS	= "$(MS_DOTNET_SDK_DIR)/Lib/mscoree.lib" \
-		  "$(MS_DOTNET_SDK_DIR)/Lib/kernel32.lib"
+# The system libraries were once needed here, but are currently unnecessary.
+MS_CL_LIBS	= 
 MERC_C_INCL_DIR = @LIBDIR@/inc
 MERC_DLL_DIR    = @LIBDIR@/inc
 


-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't everyone's cup of fur.
     trd at cs.mu.oz.au        # 
http://www.cs.mu.oz.au/~trd #
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------