diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2018-05-31 11:26:18 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2018-05-31 11:26:18 +0300 |
| commit | 46ea04d8e548bdc9df192712ea13f762d4a5a9d4 (patch) | |
| tree | d0ba08103cf7e9f0c7d9cb305be4496bda266fd1 /WCC_MAKEFILE | |
| parent | 69c0495cbd08ad8050a70c73d8c0e53e472fc730 (diff) | |
| download | bdwgc-46ea04d8e548bdc9df192712ea13f762d4a5a9d4.tar.gz | |
Fix compilation by WCC makefile
* WCC_MAKEFILE (CFLAGS, CXXFLAGS): Add -iinclude.
* WCC_MAKEFILE (CXXFLAGS, TEST_CXXFLAGS): Add -xs.
* WCC_MAKEFILE (gc_cpp.obj, test_cpp.obj): Remove -iinclude.
* WCC_MAKEFILE (test.obj): Pass tests\test.c instead of $*.c.
* WCC_MAKEFILE (test_cpp.obj): Pass tests\test_cpp.cc instead of $*.cc.
Diffstat (limited to 'WCC_MAKEFILE')
| -rw-r--r-- | WCC_MAKEFILE | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE index 48ba59ae..0aae2df7 100644 --- a/WCC_MAKEFILE +++ b/WCC_MAKEFILE @@ -25,7 +25,7 @@ CPU=5 OPTIM=-oneatx -s #OPTIM=-ohneatx -s -DEFS=-DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM #-DSMALL_CONFIG #-DGC_DEBUG +DEFS=-DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM #-DSMALL_CONFIG ##### @@ -66,10 +66,10 @@ TEST_DLLFLAG= CC=wcc386 CXX=wpp386 -CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -zp4 -zc $(SYSFLAG) $(DLLFLAG) $(DEFS) -CXXFLAGS= $(CFLAGS) -TEST_CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -zp4 -zc $(SYSFLAG) $(TEST_DLLFLAG) $(DEFS) -TEST_CXXFLAGS= $(TEST_CFLAGS) +CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -iinclude -zp4 -zc $(SYSFLAG) $(DLLFLAG) $(DEFS) +CXXFLAGS= $(CFLAGS) -xs +TEST_CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -iinclude -zp4 -zc $(SYSFLAG) $(TEST_DLLFLAG) $(DEFS) +TEST_CXXFLAGS= $(TEST_CFLAGS) -xs OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj & mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj & @@ -138,12 +138,11 @@ test_cpp.exe: test_cpp.obj gc.lib *wlink @$*.lnk gc_cpp.obj: gc_cpp.cc .AUTODEPEND - $(CXX) $(TEST_CXXFLAGS) -iinclude $*.cc + $(CXX) $(TEST_CXXFLAGS) $*.cc test.obj: tests\test.c .AUTODEPEND - $(CC) $(TEST_CFLAGS) $*.c + $(CC) $(TEST_CFLAGS) tests\test.c test_cpp.obj: tests\test_cpp.cc .AUTODEPEND - $(CXX) $(TEST_CXXFLAGS) -iinclude $*.cc - + $(CXX) $(TEST_CXXFLAGS) tests\test_cpp.cc .c.obj: .AUTODEPEND $(CC) $(CFLAGS) $*.c |