Change 31344 by [EMAIL PROTECTED] on 2007/06/06 16:48:46
Stop VC7 and VC8 warning about overriding /DPERLDLL with /UPERLDLL
when compiling perlmain.c, and don't supply /DPERLDLL twice when
compiling perlmainst.c
Affected files ...
... //depot/perl/win32/Makefile#336 edit
... //depot/perl/win32/makefile.mk#374 edit
Differences ...
==== //depot/perl/win32/Makefile#336 (text) ====
Index: perl/win32/Makefile
--- perl/win32/Makefile#335~31245~ 2007-05-20 16:10:15.000000000 -0700
+++ perl/win32/Makefile 2007-06-06 09:48:46.000000000 -0700
@@ -984,13 +984,13 @@
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) \
==== //depot/perl/win32/makefile.mk#374 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#373~31300~ 2007-05-29 01:09:38.000000000 -0700
+++ perl/win32/makefile.mk 2007-06-06 09:48:46.000000000 -0700
@@ -1287,13 +1287,13 @@
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"
End of Patch.
