From: Steve Hay <SteveHay@planit.com>
Date: Wed, 6 Jun 2007 16:48:46 +0000 (+0000)
Subject: Stop VC7 and VC8 warning about overriding /DPERLDLL with /UPERLDLL
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=88c9158a91a1955a339ddf2df5c91907a15bef4c;p=p5sagit%2Fp5-mst-13.2.git

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
---

diff --git a/win32/Makefile b/win32/Makefile
index 559fd31..c2e500f 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 c37a5d9..9e01c98 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"