summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-11 02:38:51 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-09-11 02:38:51 +0000
commit0eb196f281259b77efe550044c05a213122a2b91 (patch)
tree2fd0ae441d1ea952268aadb6ab79828b38a82d98 /win32
parentc0d0125bc70d7fbde34bea82f9c06bf6cb57b2eb (diff)
* bcc32/Makefile.sub: remove unnecessary `.dll' from filename of
dll's resource file. * cygwin/GNUmakefile.in: ditto. [ruby-dev:17103] * win32/Makefile.sub: ditto. [ruby-dev:17103] * win32/resource.rb: ditto. [ruby-dev:17103] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub10
-rw-r--r--win32/resource.rb4
2 files changed, 7 insertions, 7 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index f2eebca..b2ba318 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -368,8 +368,8 @@ $(LIBRUBY_A): $(OBJS) dmyext.obj
$(LIBRUBY): $(RUBYDEF)
$(AR) -out:$@ -def:$(RUBYDEF) -machine:$(MACHINE)
-$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $@.res
- $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $@.res $(LIBS) \
+$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $*.res
+ $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $*.res $(LIBS) \
-Fe$@ -link -dll -def:$(RUBYDEF)
$(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT)
@@ -416,7 +416,7 @@ distclean-local: clean-local
@if exist $(RUBYDEF) del $(RUBYDEF)
@if exist $(RUBY_INSTALL_NAME).rc del $(RUBY_INSTALL_NAME).rc
@if exist $(RUBYW_INSTALL_NAME).rc del $(RUBYW_INSTALL_NAME).rc
- @if exist $(LIBRUBY_SO).rc del $(LIBRUBY_SO).rc
+ @if exist $(RUBY_SO_NAME).rc del $(RUBY_SO_NAME).rc
@if exist $(PROGRAM) del $(PROGRAM)
@if exist $(WPROGRAM) del $(WPROGRAM)
@if exist $(LIBRUBY_SO) del $(LIBRUBY_SO)
@@ -439,11 +439,11 @@ rbconfig.rb: miniruby$(EXEEXT) config.status
-install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
@.\miniruby$(EXEEXT) $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) \
-rubyw_name=$(RUBYW_INSTALL_NAME) \
- -so_name=$(LIBRUBY_SO) \
+ -so_name=$(RUBY_SO_NAME) \
. $(icondirs) $(srcdir)/win32
{$(srcdir)/missing}.c.obj:
diff --git a/win32/resource.rb b/win32/resource.rb
index d29691e..e8a64a6 100644
--- a/win32/resource.rb
+++ b/win32/resource.rb
@@ -8,7 +8,7 @@ fversion = "#{CONFIG['MAJOR']},#{CONFIG['MINOR']},#{CONFIG['TEENY']},0"
$ruby_name ||= CONFIG["RUBY_INSTALL_NAME"]
$rubyw_name ||= CONFIG["RUBYW_INSTALL_NAME"] || $ruby_name.sub(/ruby/, '\&w')
-$so_name ||= CONFIG["RUBY_SO_NAME"] + '.dll'
+$so_name ||= CONFIG["RUBY_SO_NAME"]
icons = {}
def icons.find(path)
@@ -49,7 +49,7 @@ end
[ # base name extension file type icons
[$ruby_name, CONFIG["EXEEXT"], 'VFT_APP', ruby_icon],
[$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon],
- [$so_name, '', 'VFT_DLL', dll_icons],
+ [$so_name, '.dll', 'VFT_DLL', dll_icons],
].each do |base, ext, type, icons|
open(base + '.rc', "w") { |f|
f.binmode if /mingw/ =~ RUBY_PLATFORM