summaryrefslogtreecommitdiff
path: root/NT_STATIC_THREADS_MAKEFILE
diff options
context:
space:
mode:
authorhboehm <hboehm>2006-04-13 02:33:04 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:36 +0200
commite740040e62c64675c8a20253cc4c2a37d8580473 (patch)
tree0f25928d003ed7e8b167e4e12e71bd679b15f4c8 /NT_STATIC_THREADS_MAKEFILE
parent7c72aee80a04eaa5d9e80fa7bfe8b174d86a3453 (diff)
2006-04-12 Hans Boehm <Hans.Boehm@hp.com> (Really mostly Andrei Polushin.)
* Makefile, Makefile.am, Makefile.direct, NT_MAKEFILE, NT_STATIC_THREADS_MAKEFILE, NT_THREADS_MAKEFILE, gc.mak, msvc_dbg.c, include/private/msvc_dbg.h: Add msvc_dbg.c, include/private/msvc_dbg.h. * Makefile.am, configure.ac: Simplify solaris threads handling. * gc_cpp.cc: Add another msft-specific new operator. * misc.c: Use per executable log-file location. * os_dep.c: Improve GetWriteWatch handling (incomplete). Support stack traces for MSVC++. * configure, Makefile.in: Regenerate. * include/gc_allocator.h: Add <new> include, more PTRFREE decls, MSVC++ 6 support.
Diffstat (limited to 'NT_STATIC_THREADS_MAKEFILE')
-rw-r--r--NT_STATIC_THREADS_MAKEFILE16
1 files changed, 8 insertions, 8 deletions
diff --git a/NT_STATIC_THREADS_MAKEFILE b/NT_STATIC_THREADS_MAKEFILE
index f37d6d1..88cd67d 100644
--- a/NT_STATIC_THREADS_MAKEFILE
+++ b/NT_STATIC_THREADS_MAKEFILE
@@ -1,4 +1,4 @@
-# Makefile for Windows NT. Assumes Microsoft compiler, and a single thread.
+# Makefile for Windows NT. Assumes Microsoft compiler.
# 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.
@@ -14,17 +14,17 @@ AO_VERSION=1.1
AO_SRC_DIR=libatomic_ops-$(AO_VERSION)/src
AO_INCLUDE_DIR=$(AO_SRC_DIR)
-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 win32_threads.obj
+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 win32_threads.obj msvc_dbg.obj
all: gctest.exe cord\de.exe test_cpp.exe
.c.obj:
- $(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_WIN32_THREADS $*.c /Fo$*.obj
+ $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -D__STDC__ -DGC_NOT_DLL -DGC_WIN32_THREADS $*.c /Fo$*.obj
.cpp.obj:
- $(cc) $(cdebug) $(cflags) $(cvars) -Iinclude -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_WIN32_THREADS /Fo$*.obj
+ $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_WIN32_THREADS /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
+$(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
gc.lib: $(OBJS)
lib /MACHINE:i386 /out:gc.lib $(OBJS)
@@ -35,7 +35,7 @@ gctest.exe: tests\test.obj gc.lib
# 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
+ $(link) -debug:full -debugtype:cv /MT $(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
@@ -44,11 +44,11 @@ cord\de_win.rbj: cord\de_win.res
cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h cord\de_cmds.h
cord\de_win.res: cord\de_win.rc cord\de_win.h cord\de_cmds.h
- $(rc) $(rcvars) -r -fo cord\de_win.res $(cvars) cord\de_win.rc
+ $(rc) $(rcvars) -r -fo cord\de_win.res $(cvarsmt) cord\de_win.rc
# 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:full -debugtype:cv /MT $(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