* 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
This commit is contained in:
nobu 2004-03-25 10:37:39 +00:00
parent 3b79d34d99
commit b47d416046
2 changed files with 11 additions and 3 deletions

View File

@ -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> Thu Mar 25 14:01:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk, */Makefile.sub (lib, dll): phony targets. * common.mk, */Makefile.sub (lib, dll): phony targets.

View File

@ -30,13 +30,13 @@ end
ruby_icon = rubyw_icon = nil ruby_icon = rubyw_icon = nil
[$ruby_name, 'ruby'].each do |i| [$ruby_name, 'ruby'].each do |i|
if i = icons.delete(i) if i = icons[i]
ruby_icon = "1 ICON DISCARDABLE "+i.dump+"\n" ruby_icon = "1 ICON DISCARDABLE "+i.dump+"\n"
break break
end end
end end
[$rubyw_name, 'rubyw'].each do |i| [$rubyw_name, 'rubyw'].each do |i|
if i = icons.delete(i) if i = icons[i]
rubyw_icon = "1 ICON DISCARDABLE "+i.dump+"\n" rubyw_icon = "1 ICON DISCARDABLE "+i.dump+"\n"
break break
end end
@ -48,7 +48,7 @@ end
[ # base name extension file type icons [ # base name extension file type icons
[$ruby_name, CONFIG["EXEEXT"], 'VFT_APP', ruby_icon], [$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], [$so_name, '.dll', 'VFT_DLL', dll_icons],
].each do |base, ext, type, icons| ].each do |base, ext, type, icons|
open(base + '.rc', "w") { |f| open(base + '.rc', "w") { |f|
@ -57,6 +57,7 @@ end
f.print <<EOF f.print <<EOF
#ifndef __BORLANDC__ #ifndef __BORLANDC__
#include <windows.h> #include <windows.h>
#include <winver.h>
#endif #endif
#{icons} #{icons}