Skip to content

Commit

Permalink
Make the lua binary configurable.
Browse files Browse the repository at this point in the history
  • Loading branch information
CIB committed Mar 25, 2014
1 parent fc08161 commit 8db0598
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ BUILD_DIR = $(CURDIR)
SRC_DIR = src
LUA_DIR = lua
LUASRC_DIR = src/lua
# if you have LUAJIT installed, try make LUA_BINARY=luajit for extra speed
LUA_BINARY = lua
LOCALIZE = 1


Expand Down Expand Up @@ -326,7 +328,7 @@ version:
if [ "x$$VERSION_STRING" != "x$$OLDVERSION" ]; then echo "#define VERSION \"$$VERSION_STRING\"" | tee $(SRC_DIR)/version.h ; fi \
)
verifyjson:
lua lua/json_verifier.lua
$(LUA_BINARY) lua/json_verifier.lua

$(ODIR):
mkdir -p $(ODIR)
Expand All @@ -346,7 +348,7 @@ $(ODIR)/SDLMain.o: $(SRC_DIR)/SDLMain.m
version.cpp: version

$(LUASRC_DIR)/catabindings.cpp: $(LUA_DIR)/class_definitions.lua $(LUASRC_DIR)/generate_bindings.lua
cd $(LUASRC_DIR) && lua generate_bindings.lua
cd $(LUASRC_DIR) && $(LUA_BINARY) generate_bindings.lua

$(SRC_DIR)/catalua.cpp: $(LUA_DEPENDENCIES)

Expand Down

0 comments on commit 8db0598

Please sign in to comment.