diff options
| author | Daniel Bovensiepen <[email protected]> | 2012-11-23 22:49:21 +0800 |
|---|---|---|
| committer | Daniel Bovensiepen <[email protected]> | 2012-11-23 22:49:21 +0800 |
| commit | cc382f9bacf43e901ec2c87616c987c7f0a3e686 (patch) | |
| tree | 78cdadbde2258c2108f563b54e2209abd78a21b8 /mrbgems/generator.c | |
| parent | 3d81ed3dc17e1112e9e47877946dea78a366a663 (diff) | |
| download | mruby-cc382f9bacf43e901ec2c87616c987c7f0a3e686.tar.gz mruby-cc382f9bacf43e901ec2c87616c987c7f0a3e686.zip | |
Add the usage of MRUBY_ROOT to the mrbgems build system, so that we can easily build everywhere
Diffstat (limited to 'mrbgems/generator.c')
| -rw-r--r-- | mrbgems/generator.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mrbgems/generator.c b/mrbgems/generator.c index 668f7471c..c1727670a 100644 --- a/mrbgems/generator.c +++ b/mrbgems/generator.c @@ -129,11 +129,15 @@ make_gem_makefile(char active_gems[1024]) char *gem_check = { 0 }; int gem_empty; - printf("CFLAGS := -I. -I../../include -I../../src\n\n" + printf("ifeq ($(strip $(MRUBY_ROOT)),)\n" + " MRUBY_ROOT := $(realpath ../../..)\n" + "endif\n\n" + "MAKEFILE_4_GEM := $(MRUBY_ROOT)/mrbgems/Makefile4gem\n\n" + "CFLAGS := -I. -I$(MRUBY_ROOT)/include -I$(MRUBY_ROOT)/src\n\n" "ifeq ($(OS),Windows_NT)\n" - "MAKE_FLAGS = --no-print-directory CC=$(CC) LL=$(LL) ALL_CFLAGS='$(ALL_CFLAGS)'\n" + " MAKE_FLAGS = --no-print-directory CC=$(CC) LL=$(LL) ALL_CFLAGS='$(ALL_CFLAGS)' MRUBY_ROOT='$(MRUBY_ROOT)' MAKEFILE_4_GEM='$(MAKEFILE_4_GEM)'\n" "else\n" - "MAKE_FLAGS = --no-print-directory CC='$(CC)' LL='$(LL)' ALL_CFLAGS='$(ALL_CFLAGS)'\n" + " MAKE_FLAGS = --no-print-directory CC='$(CC)' LL='$(LL)' ALL_CFLAGS='$(ALL_CFLAGS)' MRUBY_ROOT='$(MRUBY_ROOT)' MAKEFILE_4_GEM='$(MAKEFILE_4_GEM)'\n" "endif\n\n"); /* is there any GEM available? */ @@ -168,9 +172,9 @@ make_gem_makefile(char active_gems[1024]) for_each_gem(" ", "/test/*.rb ", "\tcat", " > mrbgemtest.rbtmp", TRUE, active_gems) ); else - printf("\t../generator rbtmp \"%s\"> mrbgemtest.rbtmp", active_gems); + printf("\t$(MRUBY_ROOT)/mrbgems/generator rbtmp \"%s\"> mrbgemtest.rbtmp", active_gems); - printf("\n\t../../bin/mrbc -Bmrbgemtest_irep -omrbgemtest.ctmp mrbgemtest.rbtmp\n\n"); + printf("\n\t$(MRUBY_ROOT)/bin/mrbc -Bmrbgemtest_irep -omrbgemtest.ctmp mrbgemtest.rbtmp\n\n"); /* Makefile Rules to Clean GEMs */ |