diff options
| author | Benoit Germain <bnt.germain@gmail.com> | 2011-02-18 20:33:43 +0100 |
|---|---|---|
| committer | Benoit Germain <bnt.germain@gmail.com> | 2011-02-18 20:33:43 +0100 |
| commit | 1760eafa1d2ebce8f07e11414a53d4a251af5b8e (patch) | |
| tree | 18f2fcd400bb35528212930c4e61be04be31bea0 /src/Makefile | |
| parent | ab233d0c9a1edc34836e2249c1eb6d714f1066b5 (diff) | |
| download | lanes-1760eafa1d2ebce8f07e11414a53d4a251af5b8e.tar.gz lanes-1760eafa1d2ebce8f07e11414a53d4a251af5b8e.tar.bz2 lanes-1760eafa1d2ebce8f07e11414a53d4a251af5b8e.zip | |
* keeper.lua is now embedded in text form instead of bytecode to improve LuaJIT2-compatibility (but this is not enough).
* moved keeper-related code in a separate source file
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index a17e9cd..df65926 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | MODULE=lanes | 8 | MODULE=lanes |
| 9 | 9 | ||
| 10 | SRC=lanes.c threading.c tools.c | 10 | SRC=lanes.c threading.c tools.c keeper.c |
| 11 | 11 | ||
| 12 | OBJ=$(SRC:.c=.o) | 12 | OBJ=$(SRC:.c=.o) |
| 13 | 13 | ||
| @@ -134,10 +134,14 @@ lanes.o: keeper.lch | |||
| 134 | # Note: 'luac -o -' could be used on systems other than Windows (where pipes | 134 | # Note: 'luac -o -' could be used on systems other than Windows (where pipes |
| 135 | # are binary). We need to support MinGW as well, so a temporary file. | 135 | # are binary). We need to support MinGW as well, so a temporary file. |
| 136 | # | 136 | # |
| 137 | # mode 1: embed bytecode version | ||
| 138 | #%.lch: %.lua | ||
| 139 | # $(LUAC) -o $@.tmp $< | ||
| 140 | # $(LUA) ../tools/bin2c.lua $@.tmp -o $@ | ||
| 141 | # -rm $@.tmp | ||
| 142 | # mode 2: embed text version (LuaJIT2-compatible) | ||
| 137 | %.lch: %.lua | 143 | %.lch: %.lua |
| 138 | $(LUAC) -o $@.tmp $< | 144 | $(LUA) ../tools/bin2c.lua $< -o $@ |
| 139 | $(LUA) ../tools/bin2c.lua $@.tmp -o $@ | ||
| 140 | -rm $@.tmp | ||
| 141 | 145 | ||
| 142 | #--- | 146 | #--- |
| 143 | # NSLU2 "slug" Linux ARM | 147 | # NSLU2 "slug" Linux ARM |
