[m-rev.] diff: update Visual C makefile for Boehm GC

[Julien Fischer]

Branches: main, 11.07

boehm_gc/NT_MAKEFILE:
 	Backport upstream fixes for Visual C {2008,2010}.

Julien.

Index: boehm_gc/NT_MAKEFILE
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/boehm_gc/NT_MAKEFILE,v
retrieving revision 1.17
diff -u -r1.17 NT_MAKEFILE
--- boehm_gc/NT_MAKEFILE	24 Feb 2010 07:04:32 -0000	1.17
+++ boehm_gc/NT_MAKEFILE	15 Jul 2011 05:58:22 -0000
@@ -1,11 +1,15 @@
  # Makefile for Windows NT.  Assumes Microsoft compiler, and a single thread.
-# DLLs are included in the root set under NT, but not under win32S.
  # Use "nmake nodebug=1 all" for optimized versions of library, gctest and editor.

  MY_CPU=X86
  CPU=$(MY_CPU)
  !include <ntwin32.mak>

+# Make sure that .cc is not viewed as a suffix.  It is for VC++2005, but
+# not earlier versions.  We can deal with either, but not inconsistency.
+.SUFFIXES:
+.SUFFIXES: .obj .cpp .c
+
  OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj extra\msvc_dbg.obj

  all: gctest.exe cord\de.exe test_cpp.exe
@@ -14,7 +18,7 @@
  	$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj

  .cpp.obj:
-	$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP /Fo$*.obj
+	$(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -D_CRT_SECURE_NO_DEPRECATE $*.cpp /Fo$*.obj

  $(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\private\msvc_dbg.h

@@ -26,8 +30,8 @@
  #	The following works for win32 debugging.  For win32s debugging use debugtype:coff
  #	and add mapsympe line.
  #  This produces a "GUI" applications that opens no windows and writes to the log file
-#  "gc.log".  This is done to make the result runnable under win32s.
-	$(link) -debug:full -debugtype:cv $(guiflags) -stack:131072 -out:$*.exe tests\test.obj $(guilibs) gc.lib
+#  "gctest.gc.log".  This is done to make the result runnable under win32s.
+	$(link) -debug -debugtype:cv $(guiflags) -stack:131072 -out:$*.exe tests\test.obj $(guilibs) gc.lib
  #	mapsympe -n -o gctest.sym gctest.exe

  cord\de_win.rbj: cord\de_win.res
@@ -40,21 +44,18 @@

  # Cord/de is a real win32 gui application.
  cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib
-	$(link) -debug:full -debugtype:cv $(guiflags) -stack:16384 -out:cord\de.exe  cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib $(guilibs)
+	$(link) -debug -debugtype:cv $(guiflags) -stack:16384 -out:cord\de.exe  cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib $(guilibs)

  gc_cpp.obj: include\gc_cpp.h include\gc.h

  gc_cpp.cpp: gc_cpp.cc
-	copy gc_cpp.cc gc_cpp.cpp
+#	copy gc_cpp.cc gc_cpp.cpp

  test_cpp.cpp: tests\test_cpp.cc
  	copy tests\test_cpp.cc test_cpp.cpp

  # This generates the C++ test executable.  The executable expects
  # a single numeric argument, which is the number of iterations.
-# The output appears in the file "gc.log".
+# The output appears in the file "test_cpp.gc.log".
  test_cpp.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib
-	$(link) -debug:full -debugtype:cv $(guiflags) -stack:16384 -out:test_cpp.exe test_cpp.obj gc.lib $(guilibs)
-
-
-
+	$(link) -debug -debugtype:cv $(guiflags) -stack:16384 -out:test_cpp.exe test_cpp.obj gc.lib $(guilibs)





--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------