summaryrefslogtreecommitdiff
path: root/NT_STATIC_THREADS_MAKEFILE
diff options
context:
space:
mode:
authorhboehm <hboehm>2006-04-29 02:05:26 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:37 +0200
commitbf75d68aaef8ba0f7ad76ff1f07182cfed283823 (patch)
treed994c523811a3a4e8d9fd5e021ee15b3ae33b935 /NT_STATIC_THREADS_MAKEFILE
parente0c23aa40014934485f5d853448bfb0d41404672 (diff)
2006-04-28 Hans Boehm <Hans.Boehm@hp.com>
* NT_STATIC_THREADS_MAKEFILE: Assorted cleanups and bug fixes for VC++.net * mark.c (alloc_mark_stack): Recycle old stack only if it doesn't break GWW_VDB. * misc.c: Try to initialize GWW_VDB earlier. Remove seemingly obsolete initialization code. More consistently use GC_LOF_FILE. * os_dep.c (GC_unix_get_mem): Ensure sbrk lock release on Irix, even in the really obscure cases. Fix GetWriteWatch error handling; work around slightly late calls to GC_enable_incremental().
Diffstat (limited to 'NT_STATIC_THREADS_MAKEFILE')
-rw-r--r--NT_STATIC_THREADS_MAKEFILE8
1 files changed, 4 insertions, 4 deletions
diff --git a/NT_STATIC_THREADS_MAKEFILE b/NT_STATIC_THREADS_MAKEFILE
index 88cd67d..6b14560 100644
--- a/NT_STATIC_THREADS_MAKEFILE
+++ b/NT_STATIC_THREADS_MAKEFILE
@@ -22,7 +22,7 @@ all: gctest.exe cord\de.exe test_cpp.exe
$(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) $(cvarsmt) -Iinclude -DALL_INTERIOR_POINTERS -DGC_NOT_DLL $*.CPP -DGC_WIN32_THREADS /Fo$*.obj
+ $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -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 include\private\msvc_dbg.h
@@ -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 /MT $(guiflags) -stack:131072 -out:$*.exe tests\test.obj $(guilibs) gc.lib
+ $(link) -debug:full -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
@@ -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 $(cvarsmt) cord\de_win.rc
+ $(rc) $(rcvars) -r -fo cord\de_win.res 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 /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)
+ $(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)
gc_cpp.obj: include\gc_cpp.h include\gc.h