diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-08-24 08:21:56 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-08-24 08:21:56 +0000 |
| commit | a1b57d0add85a248666fb55c58aa8c0c772136fc (patch) | |
| tree | 3d30e530b29103ce2884dff782592ddf7292f4df /win32 | |
| parent | a281c996689240dc204f0c534cfe21ee6cbb6863 (diff) | |
1.4.1 to be
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 4 | ||||
| -rw-r--r-- | win32/config.h | 2 | ||||
| -rw-r--r-- | win32/config.status | 2 | ||||
| -rw-r--r-- | win32/ruby.def | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/win32/Makefile b/win32/Makefile index 5275069bf8..d4f143bfca 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -80,7 +80,7 @@ OBJS = array.obj \ version.obj \ $(MISSING) -all: miniruby$(EXEEXT) rbconfig.rb ext/extmk.rb ext/Setup.nt rubymw.lib $(MISCLIBS) +all: miniruby$(EXEEXT) rbconfig.rb ext/extmk.rb ext/Setup rubymw.lib $(MISCLIBS) set LIB=..\..\win32;$(ORGLIBPATH) @.\miniruby$(EXEEXT) -Xext extmk.rb @@ -248,7 +248,7 @@ file.obj: file.c ruby.h config.h defines.h intern.h rubyio.h rubysig.h gc.obj: gc.c ruby.h config.h defines.h intern.h rubysig.h st.h node.h env.h re.h regex.h hash.obj: hash.c ruby.h config.h defines.h intern.h st.h rubysig.h util.h inits.obj: inits.c ruby.h config.h defines.h intern.h -io.obj: io.c ruby.h config.h defines.h intern.h rubyio.h rubysig.h +io.obj: io.c ruby.h config.h defines.h intern.h rubyio.h rubysig.h env.h main.obj: main.c ruby.h config.h defines.h intern.h marshal.obj: marshal.c ruby.h config.h defines.h intern.h rubyio.h st.h prec.obj: prec.c ruby.h config.h defines.h intern.h diff --git a/win32/config.h b/win32/config.h index c871d7073d..3ded77ebfd 100644 --- a/win32/config.h +++ b/win32/config.h @@ -41,6 +41,8 @@ #define DLEXT ".dll" #define RUBY_LIB "/usr/local/lib/ruby/1.4" #define RUBY_ARCHLIB "/usr/local/lib/ruby/1.4/i386-mswin32" +#define RUBY_SITE_LIB "/usr/local/lib/ruby/1.4/site_ruby" +#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/1.4/site_ruby/i386-mswin32" #define RUBY_PLATFORM "i386-mswin32" #define SIZEOF_INT 4 diff --git a/win32/config.status b/win32/config.status index 09b2465390..46a301acb4 100644 --- a/win32/config.status +++ b/win32/config.status @@ -48,7 +48,7 @@ s%@LDSHARED@%cl -LD%g s%@DLEXT@%dll%g s%@STRIP@%%g s%@EXTSTATIC@%%g -s%@setup@%Setup.nt%g +s%@setup@%Setup s%@LIBRUBY_LDSHARED@%%g s%@LIBRUBY_DLDFLAGS@%%g s%@RUBY_INSTALL_NAME@%ruby%g diff --git a/win32/ruby.def b/win32/ruby.def index 126b4f2697..7de1e8de59 100644 --- a/win32/ruby.def +++ b/win32/ruby.def @@ -279,6 +279,7 @@ EXPORTS rb_apply rb_funcall rb_funcall2 + rb_funcall3 rb_backtrace rb_frame_last_func rb_obj_instance_eval |