Change 29402 by [EMAIL PROTECTED] on 2006/11/28 11:57:35
Give perl.exe an icon when built with MinGW and Borland
It already gets an icon when built with VC++, but the MinGW and Borland
builds were not making any use of the resource file.
Also add the top-level directory into MinGW's resource compiler search
path to assist ActivePerl builds: see:
http://downloads.activestate.com/ActivePerl/src/5.8/AP819_diff.txt
Affected files ...
... //depot/perl/win32/makefile.mk#358 edit
Differences ...
==== //depot/perl/win32/makefile.mk#358 (text) ====
Index: perl/win32/makefile.mk
--- perl/win32/makefile.mk#357~29396~ 2006-11-27 09:39:00.000000000 -0800
+++ perl/win32/makefile.mk 2006-11-28 03:57:35.000000000 -0800
@@ -679,7 +679,7 @@
.rc.res:
.IF "$(CCTYPE)" == "GCC"
- $(RSC) --use-temp-file -i $< -o $@
+ $(RSC) --use-temp-file -I . -I .. -O COFF -i $< -o $@
.ELSE
$(RSC) -i.. $<
.ENDIF
@@ -1279,10 +1279,11 @@
$(LINK32) -Tpe -ap $(BLINK_FLAGS) \
@$(mktmp c0x32$(o) $(PERLEXE_OBJ:s,\,$B,)$N \
$(@:s,\,$B,),$N \
- $(PERLIMPLIB:s,\,$B,) $(LIBFILES)$N)
+ $(PERLIMPLIB:s,\,$B,) $(LIBFILES),$N \
+ $(PERLEXE_RES:s,\,$B,)$N)
.ELIF "$(CCTYPE)" == "GCC"
$(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \
- $(PERLEXE_OBJ) $(PERLIMPLIB) $(LIBFILES)
+ $(PERLEXE_OBJ) $(PERLEXE_RES) $(PERLIMPLIB) $(LIBFILES)
.ELSE
$(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(BLINK_FLAGS) \
$(LIBFILES) $(PERLEXE_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB)
$(PERLEXE_RES)
@@ -1299,11 +1300,13 @@
@$(mktmp c0x32$(o) $(PERLEXEST_OBJ:s,\,$B,)$N \
$(@:s,\,$B,),$N \
$(subst,\,$B $(shell @type Extensions_static)) \
- $(PERLSTATICLIB:s,\,$B,) $(LIBFILES)$N)
+ $(PERLSTATICLIB:s,\,$B,) $(LIBFILES),$N \
+ $(PERLEXE_RES:s,\,$B,)$N)
.ELIF "$(CCTYPE)" == "GCC"
$(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \
$(mktmp $(LKPRE) $(subst,\,$B $(shell @type Extensions_static)) \
- $(PERLSTATICLIB:s,\,$B,) $(LIBFILES) $(PERLEXEST_OBJ) $(LKPOST))
+ $(PERLSTATICLIB:s,\,$B,) $(LIBFILES) $(PERLEXEST_OBJ) \
+ $(PERLEXE_RES:s,\,$B,) $(LKPOST))
.ELSE
$(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(BLINK_FLAGS) \
@Extensions_static $(PERLSTATICLIB) \
End of Patch.
