summaryrefslogtreecommitdiff
path: root/NT_MAKEFILE
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2019-07-25 00:55:22 +0300
committerIvan Maidanski <ivmai@mail.ru>2019-07-25 00:56:47 +0300
commit40fba167c81f46f3770e902355a6952200b51028 (patch)
treef062ef94aa893ca435dab3b610e77d55cd9afcbf /NT_MAKEFILE
parent40fcb59ed30f55076b5e6bbfca798ad0cad0302c (diff)
downloadbdwgc-40fba167c81f46f3770e902355a6952200b51028.tar.gz
Compile gc.c unless building static libraries (NT_MAKEFILE, WCC_MAKEFILE)
This is to match the behavior of CMake and configure scripts. * NT_MAKEFILE [!ENABLE_STATIC] (OBJS): Set to extra\gc.obj, extra\msvc_dbg.obj. * WCC_MAKEFILE (OBJS): Define only if ENABLE_STATIC. * WCC_MAKEFILE [!ENABLE_STATIC] (gc.obj): New target. * WCC_MAKEFILE [!ENABLE_STATIC] (gc.dll): Depend on and append gc.obj instead of $(OBJS) elements.
Diffstat (limited to 'NT_MAKEFILE')
-rw-r--r--NT_MAKEFILE4
1 files changed, 4 insertions, 0 deletions
diff --git a/NT_MAKEFILE b/NT_MAKEFILE
index 3266d9af..76784f60 100644
--- a/NT_MAKEFILE
+++ b/NT_MAKEFILE
@@ -88,7 +88,11 @@ CFLAGS_DEFAULT=-DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTAB
AO_SRC_DIR=libatomic_ops/src
AO_INCLUDE_DIR=$(AO_SRC_DIR)
+!IFDEF ENABLE_STATIC
OBJS= misc.obj win32_threads.obj alloc.obj reclaim.obj allchblk.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 fnlz_mlc.obj malloc.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gcj_mlc.obj mallocx.obj extra\msvc_dbg.obj thread_local_alloc.obj
+!ELSE
+OBJS= extra\gc.obj extra\msvc_dbg.obj
+!ENDIF
COBJS= cord\cordbscs.obj cord\cordxtra.obj cord\cordprnt.obj