summaryrefslogtreecommitdiff
path: root/win32/resource.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-25 10:37:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-25 10:37:39 +0000
commitb47d4160468872c096fe1e3841b7c67c1ea6bad9 (patch)
treedb97cbee326b878b5a8a750093d6d77cc625a6f6 /win32/resource.rb
parent3b79d34d990e285521e23e4f792f91b4cb815460 (diff)
* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
include them. * win32/resource.rb: include winver.h for older WindowsCE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/resource.rb')
-rw-r--r--win32/resource.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/win32/resource.rb b/win32/resource.rb
index 9ad8772b64b..62defb1d80b 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}