summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-20 09:55:22 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-20 09:55:22 +0000
commit57b9ac65f8bab0584caa703b717300864bbcb21e (patch)
tree0f231931e1581b349c13be5329a7fde2a332f6db
parentf5d249479ff8cd71d4943e153af74b3e3b7ae08b (diff)
* win32/Makefile.sub (ARCHMINIOBJ): merge miss of r27053.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/Makefile.sub2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ddff8e6398..76d6cc1133 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 20 18:54:33 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (ARCHMINIOBJ): merge miss of r27053.
+
Wed May 19 23:36:57 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/extconf.rb: [ruby-dev:41334] [Bug #3307] invalid result
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index cb33972ea3..1750000421 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -246,7 +246,7 @@ MKMAIN_CMD = mkmain.bat
!if !defined(WINMAINOBJ)
WINMAINOBJ = winmain.$(OBJEXT)
!endif
-MINIOBJS = dmydln.$(OBJEXT)
+ARCHMINIOBJS = dmydln.$(OBJEXT)
LIBOBJS = acosh.obj crypt.obj erf.obj strlcpy.obj strlcat.obj win32.obj $(LIBOBJS)
!ifndef COMMON_LIBS