diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-04-14 14:10:13 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-04-14 14:10:13 -0700 |
| commit | a06e0ab33f255a54d72c0775e5d9e4047064ccb8 (patch) | |
| tree | f970eb2ab188ce78c586611b2bdc9dd086001dd6 /doc | |
| parent | 06cca20aeb85627de1e057797f663efcc8018c34 (diff) | |
| parent | d0d5594ea05c21135f5757dcc904fe03fe9a7c82 (diff) | |
| download | mruby-a06e0ab33f255a54d72c0775e5d9e4047064ccb8.tar.gz mruby-a06e0ab33f255a54d72c0775e5d9e4047064ccb8.zip | |
Merge pull request #1182 from trmmy/move_tools
Update doc/compile/README.md about mruby and mirb
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/compile/README.md | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/doc/compile/README.md b/doc/compile/README.md index 765a2e97c..231f8995c 100644 --- a/doc/compile/README.md +++ b/doc/compile/README.md @@ -83,13 +83,14 @@ in ```ANDROID_STANDALONE_TOOLCHAIN```. It is possible to select which tools should be compiled during the compilation process. The following tools can be selected: -* mrbc (mruby compiler) * mruby (mruby interpreter) * mirb (mruby interactive shell) -To select all define an array in ```conf.bins```: +To select them declare conf.gem as follows: - conf.bins = %(mrbc mruby mirb) + conf.gem "#{root}/mrbgems/mruby-bin-mruby" + + conf.gem "#{root}/mrbgems/mruby-bin-mirb" ### File Separator @@ -243,9 +244,9 @@ linking with *build/host/lib/libmruby_core.a* under *mrblib* with ```build/host/bin/mrbc``` * compile *build/host/mrblib/mrblib.c* to *build/host/mrblib/mrblib.o* * create *build/host/lib/libmruby.a* out of all object files (C and Ruby) -* create ```build/host/bin/mruby``` by compiling *tools/mruby/mruby.c* and +* create ```build/host/bin/mruby``` by compiling *mrbgems/mruby-bin-mruby/tools/mruby/mruby.c* and linking with *build/host/lib/libmruby.a* -* create ```build/host/bin/mirb``` by compiling *tools/mirb/mirb.c* and +* create ```build/host/bin/mirb``` by compiling *mrbgems/mruby-bin-mirb/tools/mirb/mirb.c* and linking with *build/host/lib/libmruby.a* ``` @@ -317,9 +318,9 @@ result will be stored in *build/i386/src/y.tab.c*) under *mrblib* with the native ```build/host/bin/mrbc``` * cross-compile *build/host/mrblib/mrblib.c* to *build/host/mrblib/mrblib.o* * create *build/i386/lib/libmruby.a* out of all object files (C and Ruby) -* create ```build/i386/bin/mruby``` by cross-compiling *tools/mruby/mruby.c* and +* create ```build/i386/bin/mruby``` by cross-compiling *mrbgems/mruby-bin-mruby/tools/mruby/mruby.c* and linking with *build/i386/lib/libmruby.a* -* create ```build/i386/bin/mirb``` by cross-compiling *tools/mirb/mirb.c* and +* create ```build/i386/bin/mirb``` by cross-compiling *mrbgems/mruby-bin-mirb/tools/mirb/mirb.c* and linking with *build/i386/lib/libmruby.a* * create *build/i386/lib/libmruby_core.a* out of all object files (C only) * create ```build/i386/bin/mrbc``` by cross-compiling *tools/mrbc/mrbc.c* and |