diff options
| author | Steve Hay <SteveHay@planit.com> | 2006-11-28 11:57:35 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2006-11-28 11:57:35 +0000 |
| commit | f721bdf3f308a637a54a1ba1759c49d70d747a8b (patch) | |
| tree | bc6b412e2710f2d2c88bf9829dabba53695d6fe1 /win32 | |
| parent | 0d4ddeff7e483fb28046cb7e890e4a921c128f6c (diff) | |
| download | perl-f721bdf3f308a637a54a1ba1759c49d70d747a8b.tar.gz | |
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
p4raw-id: //depot/perl@29402
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index 89ad670f11..160039819e 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -679,7 +679,7 @@ $(o).dll: .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 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) $(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 @@ $(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES) @$(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) \ |