diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-05-23 02:20:13 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-05-23 02:20:13 +0900 |
| commit | df25301d8081b9351d8a2a9910c2f1d36de3f134 (patch) | |
| tree | 4f9cb83bab56b02a41a6139c8d23d7b071529845 /src | |
| parent | f44acf7bf87c8f4ad258a41bb7884c1f09a8aab9 (diff) | |
| parent | 0dc183b8f473e1398b1aeada9a39d96ad4d81518 (diff) | |
| download | mruby-df25301d8081b9351d8a2a9910c2f1d36de3f134.tar.gz mruby-df25301d8081b9351d8a2a9910c2f1d36de3f134.zip | |
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/regex.h | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 000000000..390129eb9 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,12 @@ +# build the core mruby C files + +find_package(BISON) +bison_target(mruby parse.y "${CMAKE_CURRENT_BINARY_DIR}/parse.c") + +file(GLOB MRUBY_SRC_C "*.c") +list(APPEND MRUBY_SRC_C "${CMAKE_CURRENT_BINARY_DIR}/parse.c") + +add_library(mruby_object OBJECT ${MRUBY_SRC_C} ${BISON_mruby_OUTPUTS}) +add_library(mruby_static STATIC EXCLUDE_FROM_ALL $<TARGET_OBJECTS:mruby_object>) + +# vim: ts=2 sts=2 sw=2 et diff --git a/src/regex.h b/src/regex.h index 4cdad2a33..f3f797b00 100644 --- a/src/regex.h +++ b/src/regex.h @@ -15,8 +15,6 @@ extern "C" { #ifndef ONIG_RUBY_M17N -ONIG_EXTERN OnigEncoding OnigEncDefaultCharEncoding; - #define mbclen(p,e,enc) mrb_enc_mbclen((p),(e),(enc)) #endif /* ifndef ONIG_RUBY_M17N */ |