diff options
| author | Steve Hay <SteveHay@planit.com> | 2007-06-06 16:48:46 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2007-06-06 16:48:46 +0000 |
| commit | 88c9158a91a1955a339ddf2df5c91907a15bef4c (patch) | |
| tree | 9914340a810da81bd2d35bae5fd1ecf231096581 /win32 | |
| parent | 574e26a812b44201554c9f5dd46af115b271490b (diff) | |
| download | perl-88c9158a91a1955a339ddf2df5c91907a15bef4c.tar.gz | |
Stop VC7 and VC8 warning about overriding /DPERLDLL with /UPERLDLL
when compiling perlmain.c, and don't supply /DPERLDLL twice when
compiling perlmainst.c
p4raw-id: //depot/perl@31344
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 4 | ||||
| -rw-r--r-- | win32/makefile.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/win32/Makefile b/win32/Makefile index 559fd318df..c2e500fe56 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -984,13 +984,13 @@ perlmain.c : runperl.c copy runperl.c perlmain.c perlmain$(o) : perlmain.c - $(CC) $(CFLAGS_O) -UPERLDLL $(OBJOUT_FLAG)$@ -c perlmain.c + $(CC) $(CFLAGS_O:-DPERLDLL=-UPERLDLL) $(OBJOUT_FLAG)$@ -c perlmain.c perlmainst.c : runperl.c copy runperl.c perlmainst.c perlmainst$(o) : perlmainst.c - $(CC) $(CFLAGS_O) -DPERLDLL $(OBJOUT_FLAG)$@ -c perlmainst.c + $(CC) $(CFLAGS_O) $(OBJOUT_FLAG)$@ -c perlmainst.c $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) $(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(LINK_FLAGS) \ diff --git a/win32/makefile.mk b/win32/makefile.mk index c37a5d9aee..9e01c98792 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1287,13 +1287,13 @@ perlmain.c : runperl.c copy runperl.c perlmain.c perlmain$(o) : perlmain.c - $(CC) $(CFLAGS_O) -UPERLDLL $(OBJOUT_FLAG)$@ -c perlmain.c + $(CC) $(CFLAGS_O:s,-DPERLDLL,-UPERLDLL,) $(OBJOUT_FLAG)$@ -c perlmain.c perlmainst.c : runperl.c copy runperl.c perlmainst.c perlmainst$(o) : perlmainst.c - $(CC) $(CFLAGS_O) -DPERLDLL $(OBJOUT_FLAG)$@ -c perlmainst.c + $(CC) $(CFLAGS_O) $(OBJOUT_FLAG)$@ -c perlmainst.c $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) .IF "$(CCTYPE)" == "BORLAND" |