diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2019-11-04 10:47:45 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2019-11-04 10:47:45 +0300 |
| commit | 803f7ed4bb05d8f79114e0e5f148e70c0a9dd3c7 (patch) | |
| tree | c19371c667a4eac66f6d8359a16829eed789c478 /WCC_MAKEFILE | |
| parent | c85518128830826f5329d8ea470bd564db578f56 (diff) | |
| download | bdwgc-803f7ed4bb05d8f79114e0e5f148e70c0a9dd3c7.tar.gz | |
Move GC_throw_bad_alloc definition to new C++ file
Issue #268 (bdgwc).
* CMakeLists.txt [enable_cplusplus] (gccpp): Add gc_badalc.cc library
source file.
* Makefile.am [CPLUSPLUS] (libgccpp_la_SOURCES): Likewise.
* Makefile.am (EXTRA_DIST): Add gc_badalc.cpp.
* Makefile.direct (SRCS): Add gc_badalc.cc.
* Makefile.direct (gc_badalc.o): New target.
* NT_MAKEFILE (gc_badalc.obj): Likewise.
* WCC_MAKEFILE (gc_badalc.obj): Likewise.
* digimars.mak (gc_badalc.obj): Likewise.
* build/s60v3/libgc.mmp (SOURCE): Mention gc_badalc.cpp (commented out).
* Makefile.direct (c++): Add dependency on gc_badalc.o; pass gc_badalc.o
to ru tool.
* NT_MAKEFILE (gccpp.lib): Add dependency on gc_badalc.obj; pass
gc_badalc.obj to lib or link tool.
* WCC_MAKEFILE (gccpp.lib, gccpp.dll): Likewise.
* digimars.mak (OBJS): Add gc_badalc.obj.
* doc/README.Mac (Files to build the GC libraries): Add gc_badalc.cc.
* doc/gcinterface.md (C++ Interface): Mention gc_badalc.cc file.
* gc_badalc.cc: New file.
* gc_badalc.cpp: Likewise.
* gc_cpp.cc (GC_throw_bad_alloc): Move to gc_badalc.cc.
* gc_cpp.cc (GC_ALLOCATOR_THROW_OR_ABORT): Add comment; do not define
unless GC_NO_INLINE_STD_NEW, or not _MSC_VER and not __DMC__.
* tests/tests.am [CPLUSPLUS && AVOID_CPP_LIB] (test_cpp_LDADD): Add
gc_badalc.o.
Diffstat (limited to 'WCC_MAKEFILE')
| -rw-r--r-- | WCC_MAKEFILE | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE index 60b013ef..612bd57f 100644 --- a/WCC_MAKEFILE +++ b/WCC_MAKEFILE @@ -103,8 +103,9 @@ cord.lib: $(COBJS) @for %i in ($(COBJS)) do @%append $*.lb1 +'%i' *wlib -b -c -n -p=512 $@ @$*.lb1 -gccpp.lib: gc_cpp.obj +gccpp.lib: gc_badalc.obj gc_cpp.obj @%create $*.lb1 + @%append $*.lb1 +'gc_badalc.obj' @%append $*.lb1 +'gc_cpp.obj' *wlib -b -c -n -p=512 $@ @$*.lb1 @@ -151,7 +152,7 @@ cord.dll: $(COBJS) gc.lib .AUTODEPEND gccpp.lib: gccpp.dll *wlib -b -c -n -p=512 $@ +gccpp.dll -gccpp.dll: gc_cpp.obj gc.lib .AUTODEPEND +gccpp.dll: gc_badalc.obj gc_cpp.obj gc.lib .AUTODEPEND @%create $*.lnk !ifdef DOS4GW @%append $*.lnk sys os2v2_dll @@ -162,6 +163,7 @@ gccpp.dll: gc_cpp.obj gc.lib .AUTODEPEND !endif @%append $*.lnk op case @%append $*.lnk name $* + @%append $*.lnk file 'gc_badalc.obj' @%append $*.lnk file 'gc_cpp.obj' @%append $*.lnk library gc.lib @%append $*.lnk library wr7$(CALLING)dll.lib @@ -226,8 +228,11 @@ cordxtra.obj: cord\cordxtra.c .AUTODEPEND cordprnt.obj: cord\cordprnt.c .AUTODEPEND $(CC) $(CFLAGS) $(CORDFLAG) cord\cordprnt.c +gc_badalc.obj: gc_badalc.cc .AUTODEPEND + $(CXX) $(TEST_CXXFLAGS) $*.cc gc_cpp.obj: gc_cpp.cc .AUTODEPEND $(CXX) $(TEST_CXXFLAGS) $*.cc + test.obj: tests\test.c .AUTODEPEND $(CC) $(TEST_CFLAGS) /wcd=13 /wcd=201 /wcd=367 /wcd=368 tests\test.c cordtest.obj: cord\tests\cordtest.c .AUTODEPEND |