diff options
| -rw-r--r-- | src/init_ext.c | 16 | ||||
| -rw-r--r-- | src/state.c | 2 | ||||
| -rw-r--r-- | tasks/mruby_build_commands.rake | 4 |
3 files changed, 2 insertions, 20 deletions
diff --git a/src/init_ext.c b/src/init_ext.c deleted file mode 100644 index 96ee34da1..000000000 --- a/src/init_ext.c +++ /dev/null @@ -1,16 +0,0 @@ -/* -** init_ext.c - initialize extend libraries -** -** See Copyright Notice in mruby.h -*/ - -#include "mruby.h" - -void -mrb_init_ext(mrb_state *mrb) -{ -#ifdef INCLUDE_SOCKET - extern void mrb_init_socket(mrb_state *mrb); - mrb_init_socket(mrb); -#endif -} diff --git a/src/state.c b/src/state.c index c48997a7c..e30b0cea3 100644 --- a/src/state.c +++ b/src/state.c @@ -11,7 +11,6 @@ void mrb_init_heap(mrb_state*); void mrb_init_core(mrb_state*); -void mrb_init_ext(mrb_state*); void mrb_final_core(mrb_state*); mrb_state* @@ -28,7 +27,6 @@ mrb_open_allocf(mrb_allocf f, void *ud) mrb_init_heap(mrb); mrb_init_core(mrb); - mrb_init_ext(mrb); return mrb; } diff --git a/tasks/mruby_build_commands.rake b/tasks/mruby_build_commands.rake index 533f0fe62..33dc82742 100644 --- a/tasks/mruby_build_commands.rake +++ b/tasks/mruby_build_commands.rake @@ -124,12 +124,12 @@ module MRuby end def library_flags(_libraries) - [libraries, _libraries].flatten.reverse.map{ |d| option_library % d }.join(' ') + [libraries, _libraries].flatten.map{ |d| option_library % d }.join(' ') end def run(outfile, objfiles, _libraries=[], _library_paths=[], _flags=[]) FileUtils.mkdir_p File.dirname(outfile) - library_flags = [libraries, _libraries].flatten.reverse.map{ |d| option_library % d } + library_flags = [libraries, _libraries].flatten.map{ |d| option_library % d } library_path_flags = [library_paths, _library_paths].flatten.map{ |f| option_library_path % filename(f) } _pp "LD", "#{filename(outfile)}" _run link_options, { :flags => (flags + library_path_flags + _flags).join(' '), |