diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | win32/resource.rb | 7 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Thu Mar 25 19:37:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also + include them. + + * win32/resource.rb: include winver.h for older WindowsCE. + Thu Mar 25 14:01:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * common.mk, */Makefile.sub (lib, dll): phony targets. diff --git a/win32/resource.rb b/win32/resource.rb index 9ad8772b64..62defb1d80 100644 --- a/win32/resource.rb +++ b/win32/resource.rb @@ -30,13 +30,13 @@ end ruby_icon = rubyw_icon = nil [$ruby_name, 'ruby'].each do |i| - if i = icons.delete(i) + if i = icons[i] ruby_icon = "1 ICON DISCARDABLE "+i.dump+"\n" break end end [$rubyw_name, 'rubyw'].each do |i| - if i = icons.delete(i) + if i = icons[i] rubyw_icon = "1 ICON DISCARDABLE "+i.dump+"\n" break end @@ -48,7 +48,7 @@ end [ # base name extension file type icons [$ruby_name, CONFIG["EXEEXT"], 'VFT_APP', ruby_icon], - [$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon], + [$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon || ruby_icon], [$so_name, '.dll', 'VFT_DLL', dll_icons], ].each do |base, ext, type, icons| open(base + '.rc', "w") { |f| @@ -57,6 +57,7 @@ end f.print <<EOF #ifndef __BORLANDC__ #include <windows.h> +#include <winver.h> #endif #{icons} |