From 48298ad66e5bc1a3517664ab294d6818ce1c4774 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Wed, 19 Dec 2018 02:17:58 +0300 Subject: Define GC_ATOMIC_UNCOLLECTABLE and JAVA_FINALIZATION in all make scripts This matches the policy of configure and CMakeLists.txt. * BCC_MAKEFILE (defines): Add -D GC_ATOMIC_UNCOLLECTABLE. * NT_MAKEFILE (.cpp.obj): Likewise. * Makefile.direct (CFLAGS): Add -D JAVA_FINALIZATION; reorder options. * NT_MAKEFILE (.c.obj): Add -D GC_ATOMIC_UNCOLLECTABLE -D JAVA_FINALIZATION. * OS2_MAKEFILE (CFLAGS): Likewise. * WCC_MAKEFILE (DEFS): Likewise. * build/s60v3/libgc.mmp: Likewise. * digimars.mak (DEFINES): Likewise. * gc.mak [$CFG=="gc - Win32 Release" || $CFG=="gc - Win32 Debug"] (CPP_PROJ): Likewise. * NT_MAKEFILE (.cpp.obj): Remove redundant -I $(AO_INCLUDE_DIR) -D ALL_INTERIOR_POINTERS. --- digimars.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'digimars.mak') diff --git a/digimars.mak b/digimars.mak index 9e9f21f8..7aff1d0b 100644 --- a/digimars.mak +++ b/digimars.mak @@ -2,7 +2,7 @@ # compiler from www.digitalmars.com # Written by Walter Bright -DEFINES=-D_WINDOWS -DGC_DLL -DGC_THREADS -DGC_DISCOVER_TASK_THREADS -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DNO_EXECUTE_PERMISSION +DEFINES=-D_WINDOWS -DGC_DLL -DGC_THREADS -DGC_DISCOVER_TASK_THREADS -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE -DJAVA_FINALIZATION -DNO_EXECUTE_PERMISSION CFLAGS=-Iinclude -Ilibatomic_ops\src $(DEFINES) -wx -g LFLAGS=/ma/implib/co CC=sc -- cgit v1.2.1