diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2018-12-19 02:17:58 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2018-12-19 02:17:58 +0300 |
| commit | 48298ad66e5bc1a3517664ab294d6818ce1c4774 (patch) | |
| tree | 25e4cb3a7760cfe79470a8195612abe46ee3e7bb /NT_MAKEFILE | |
| parent | ec9885b773d1cc51161ce97a86b845fca0e08ae3 (diff) | |
| download | bdwgc-48298ad66e5bc1a3517664ab294d6818ce1c4774.tar.gz | |
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.
Diffstat (limited to 'NT_MAKEFILE')
| -rw-r--r-- | NT_MAKEFILE | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NT_MAKEFILE b/NT_MAKEFILE index efb1e969..0f4904ca 100644 --- a/NT_MAKEFILE +++ b/NT_MAKEFILE @@ -92,12 +92,12 @@ OBJS= misc.obj win32_threads.obj alloc.obj reclaim.obj allchblk.obj mach_dep.obj all: gctest.exe cord\de.exe test_cpp.exe .c.obj: - $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DNO_EXECUTE_PERMISSION -DCORD_NOT_DLL -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4100 /wd4127 /wd4701 + $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE -DJAVA_FINALIZATION -DNO_EXECUTE_PERMISSION -DCORD_NOT_DLL -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4100 /wd4127 /wd4701 # 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) $(CFLAGS_SPECIFIC) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -D_CRT_SECURE_NO_DEPRECATE $*.cpp /Fo$*.obj + $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) -Iinclude -DGC_ATOMIC_UNCOLLECTABLE -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\gc_disclaim.h include\private\msvc_dbg.h |