わたなべです.

ruby-ext に移ります.

Masaki Suketa <CQN02273 / nifty.ne.jp> writes:

:> に置きました. patch はのちほど.
:
:よろしくお願いします.

o なんか変だけど cygwin 専用の Makefile.RB を作った.
o rb_default_rs は import.h で define してるので名前を変えた.
o b20.1 だと richedit.h, commctrl.h はないので cygwin/ に適
  当に作った. 最近の cygwin-inst なら要らない. てゆうか早く
  cygwin 1.1 を出してくれ cygnus よ. 予定の 3/6 はとっくに過
  ぎてるんだから.

diff -u1rN --exclude=Makefile rubywin-000311/Makefile.RB rubywin-cygwin/Makefile.RB --- rubywin-000311/Makefile.RB Thu Jan 01 09:00:00 1970 +++ rubywin-cygwin/Makefile.RB Sun Mar 12 18:41:34 2000 @@ -0,0 +1,31 @@ +require 'mkmf' + +if /cygwin/ =~ RUBY_PLATFORM + SRC_EXT << 'rc' + create_makefile('rubywin') + if File.exist? 'Makefile' + save_i = $-i + save_argv = ARGV.dup + $-i = '.orig' + ARGV.replace ['Makefile'] + while line = gets + sub /^all:.*/, 'all: $(TARGET)$(EXEEXT)' + print + end + print <<EOM +.SUFFIXES: .cpp +LOCAL_LIBS = -lwinmm -lcomdlg32 -lcomctl32 -limm32 -lole32 -luuid -lstdc++ +WINDRESOPT = --define USE_WINDRES +.cpp.o: + $(CC) -Icygwin $(CXXFLAGS) -c $*.cpp -o $@ +$(TARGET)$(EXEEXT): $(OBJS) + $(CC) $(LDFLAGS) $(XLDFLAGS) $(OBJS) $(LIBRUBYARG) $(LIBS) $(LOCAL_LIBS) -mwindows -o $@ +resource.o: resource.rc resource.h + windres $(WINDRESOPT) resource.rc resource.o +EOM + $-i = save_i + ARGV.replace save_argv + end +end + +# vi:set sw=2: diff -u1rN --exclude=Makefile rubywin-000311/cygwin/commctrl.h rubywin-cygwin/cygwin/commctrl.h --- rubywin-000311/cygwin/commctrl.h Thu Jan 01 09:00:00 1970 +++ rubywin-cygwin/cygwin/commctrl.h Sun Mar 12 17:09:58 2000 @@ -0,0 +1 @@ +/* dummy commctrl.h */ diff -u1rN --exclude=Makefile rubywin-000311/cygwin/richedit.h rubywin-cygwin/cygwin/richedit.h --- rubywin-000311/cygwin/richedit.h Thu Jan 01 09:00:00 1970 +++ rubywin-cygwin/cygwin/richedit.h Sun Mar 12 16:50:09 2000 @@ -0,0 +1,5 @@ +#if !defined __RICHEDIT_H +#define __RICHEDIT_H +#define SCF_ALL 4 +#define CFM_CHARSET 0x08000000 +#endif diff -u1rN --exclude=Makefile rubywin-000311/filedlg.cpp rubywin-cygwin/filedlg.cpp --- rubywin-000311/filedlg.cpp Sun Mar 12 16:25:22 2000 +++ rubywin-cygwin/filedlg.cpp Sun Mar 12 15:38:14 2000 @@ -6,2 +6,3 @@ #include <windows.h> +#include <string.h> #include "filedlg.h" diff -u1rN --exclude=Makefile rubywin-000311/rwclass.cpp rubywin-cygwin/rwclass.cpp --- rubywin-000311/rwclass.cpp Sun Mar 12 16:25:23 2000 +++ rubywin-cygwin/rwclass.cpp Sun Mar 12 15:51:00 2000 @@ -54,3 +54,3 @@ int i; - VALUE rb_default_rs = rb_str_new2("\r\n"); + VALUE default_rs = rb_str_new2("\r\n"); VALUE str = rb_str_new("", 0); @@ -58,3 +58,3 @@ rb_str_concat(str, rb_obj_as_string(rb_inspect(argv[i]))); - rb_str_concat(str, rb_default_rs); + rb_str_concat(str, default_rs); } diff -u1rN --exclude=Makefile rubywin-000311/rwcommon.cpp rubywin-cygwin/rwcommon.cpp --- rubywin-000311/rwcommon.cpp Sun Mar 12 16:25:23 2000 +++ rubywin-cygwin/rwcommon.cpp Sun Mar 12 15:51:46 2000 @@ -7,2 +7,3 @@ #include <stdio.h> +#include <string.h> #include "rwcommon.h"