X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fmm%2Fboehm-gc%2FNT_X64_THREADS_MAKEFILE;h=ee851a6c1f847c27e2365e11b05d28fffa05ed0e;hb=c9ee016a64e925938f84fcb85521f82febcc4f63;hp=5a16aec08ea4d9eddacf61afc50e003e005070b4;hpb=7cdbbe3be2b5834a248a600176c742bd94aaf730;p=cacao.git

diff --git a/src/mm/boehm-gc/NT_X64_THREADS_MAKEFILE b/src/mm/boehm-gc/NT_X64_THREADS_MAKEFILE
index 5a16aec08..ee851a6c1 100644
--- a/src/mm/boehm-gc/NT_X64_THREADS_MAKEFILE
+++ b/src/mm/boehm-gc/NT_X64_THREADS_MAKEFILE
@@ -1,7 +1,7 @@
 # Makefile for Windows NT.  Assumes Microsoft compiler.
 # modified 2007 August by Friedrich Dominicus:
 #			- copied from NT_X64_STATIC_THREADS_MAKEFILES
-#                       - checked agaist NT_THREADS_MAKEFILE
+#                       - checked agaist gc.mak (NT_THREADS_MAKEFILE)
 #                       - added changes to integrate the tools
 #                       - currently just with debug information
 # problems can be sent to
@@ -22,21 +22,20 @@ CPU=$(MY_CPU)
 # should do, since we only need the headers.
 # We assume this was manually unpacked, since I'm not sure there is
 # a Windows standard command line tool to do this.
-AO_VERSION=1.2
-AO_SRC_DIR=libatomic_ops-$(AO_VERSION)/src
+AO_SRC_DIR=libatomic_ops/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 msvc_dbg.obj thread_local_alloc.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 extra\msvc_dbg.obj thread_local_alloc.obj
 
 all: gc64_dll.dll gctest.exe cord\de.exe test_cpp.exe
 
 .c.obj:
-	$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_DLL -D__STDC__ -DGC_BUILD -DGC_WIN32_THREADS  $*.c /Fo$*.obj /wd4701 -D_CRT_SECURE_NO_DEPRECATE
+	$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_DLL -DGC_THREADS -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4701
 # Disable "may not be initialized" warnings.  They're too approximate.
 # Disable crt security warnings, since unfortunately they warn about all sorts # of safe uses of strncpy.  It would be nice to leave the rest enabled.
 
 .cpp.obj:
-	$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL-DALL_INTERIOR_POINTERS -DGC_DLL -D__STDC__ -DGC_BUILD -DGC_WIN32_THREADS $*.CPP /Fo$*.obj -D_CRT_SECURE_NO_DEPRECATE
+	$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DALL_INTERIOR_POINTERS -DGC_DLL -DGC_THREADS -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