diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2019-07-20 00:44:38 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2019-07-20 00:44:38 +0300 |
| commit | 04bf5f44d27884914c40fe033adeaee5ea644863 (patch) | |
| tree | 99f76200c2f5031f29ecd40e8392038afb1f3728 /NT_MAKEFILE | |
| parent | 04afa25bcbef482ada54c883e56c7661c7445625 (diff) | |
| download | bdwgc-04bf5f44d27884914c40fe033adeaee5ea644863.tar.gz | |
Rename make_as_lib option to enable_static in NT_MAKEFILE and WCC_MAKEFILE
This is to match the behavior of CMake script.
* NT_MAKEFILE: Update header comment (rename make_as_lib to
enable_static).
* NT_MAKEFILE (MAKE_AS_LIB): Rename to ENABLE_STATIC.
* WCC_MAKEFILE (MAKE_AS_DLL): Remove (check "ndef ENABLE_STATIC"
instead).
* WCC_MAKEFILE (MAKE_AS_LIB): Rename to ENABLE_STATIC; update comment.
* doc/README.win32 (Microsoft Tools): Rename make_as_lib to
enable_static.
* doc/README.win64: Likewise.
Diffstat (limited to 'NT_MAKEFILE')
| -rw-r--r-- | NT_MAKEFILE | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/NT_MAKEFILE b/NT_MAKEFILE index 89c266d2..571822d0 100644 --- a/NT_MAKEFILE +++ b/NT_MAKEFILE @@ -1,7 +1,7 @@ # Makefile for Windows NT. Assumes Microsoft compiler. # Should be invoked as "nmake -f NT_MAKEFILE [<args>]"; the optional arguments # are: "cpu=AMD64" - to target x64, "cpu=i386" - to target x86, -# "make_as_lib=1" - to build it as a static library, "nodebug=1" - to produce +# "enable_static=1" - to build it as a static library, "nodebug=1" - to produce # the release variant of the library, "disable_threads=1" - to build the # library and the tests without threads support. @@ -56,7 +56,7 @@ CFLAGS_DEBUG=-DGC_ASSERTIONS CFLAGS_MT=$(cvarsmt) -DGC_THREADS -DTHREAD_LOCAL_ALLOC -DPARALLEL_MARK !ENDIF -!IFDEF MAKE_AS_LIB +!IFDEF ENABLE_STATIC CFLAGS_GCDLL=-DGC_NOT_DLL !ELSE CFLAGS_GCDLL=-DGC_DLL @@ -95,7 +95,7 @@ check: gctest.exe test_cpp.exe de.exe $(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 -!IFDEF MAKE_AS_LIB +!IFDEF ENABLE_STATIC gc.lib: $(OBJS) lib /out:gc.lib /MACHINE:$(CPU) $(OBJS) |