[#28337] constant look up order in CVS HEAD — Yukihiro Matsumoto <matz@...>

まつもと ゆきひろです

15 messages 2006/02/18
[#28338] Re: constant look up order in CVS HEAD — Tanaka Akira <akr@...17n.org> 2006/02/19

In article <1140229116.805371.31930.nullmailer@x31.priv.netlab.jp>,

[#28341] Re: constant look up order in CVS HEAD — GOTOU Yuuzou <gotoyuzo@...> 2006/02/19

In message <87lkw8xfay.fsf@m17n.org>,

[#28342] Re: constant look up order in CVS HEAD — Yukihiro Matsumoto <matz@...> 2006/02/19

まつもと ゆきひろです

[ruby-dev:28358] Re: bcc32 memory manager

From: "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>
Date: 2006-02-21 05:24:42 UTC
List: ruby-dev #28358
山本です。

とりあえず usebormm.lib のある環境では usebormm.lib をリンクし、
そうでない環境ではしないパッチを作ってみました。

個人的には usebormm.lib を必須にしたいのですが(1MB以上のメモリを
扱うと落ちるんですから --;)それだと Free Compiler などでビルドでき
なくなるし・・・妥協の産物です。

Index: Makefile.sub
===================================================================
RCS file: /src/ruby/bcc32/Makefile.sub,v
retrieving revision 1.84
diff -u -w -b -p -r1.84 Makefile.sub
--- Makefile.sub	25 Oct 2005 16:59:17 -0000	1.84
+++ Makefile.sub	21 Feb 2006 04:51:07 -0000
@@ -129,7 +129,10 @@ RFLAGS = $(iconinc)
 !ifndef EXTLIBS
 EXTLIBS =
 !endif
-LIBS = cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
+!ifndef MEMLIB
+MEMLIB =
+!endif
+LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
 MISSING = acosh.obj crypt.obj erf.obj win32.obj
 
 !ifndef STACK
Index: setup.mak
===================================================================
RCS file: /src/ruby/bcc32/setup.mak,v
retrieving revision 1.14
diff -u -w -b -p -r1.14 setup.mak
--- setup.mak	19 Apr 2005 22:27:41 -0000	1.14
+++ setup.mak	21 Feb 2006 04:49:06 -0000
@@ -54,6 +54,14 @@ EXTOUT = $(EXTOUT)
 $(BANG)endif
 !endif
 |
+	@type > checkmm.bat &&|
+@echo off
+ilink32 -Gn -x usebormm.lib > nul
+if exist usebormm.tds echo MEMLIB = usebormm.lib
+|
+	@checkmm.bat >> $(MAKEFILE)
+	@del checkmm.*
+
 	@cpp32 -I$(srcdir) -P- -DRUBY_EXTERN="//" -o$(MAKEFILE) > nul &&|
 \#include "version.h"
 MAJOR = RUBY_VERSION_MAJOR


In This Thread