From 4a60c8aa6e95a65f241934530fa865eb9904d010 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 15 Nov 2015 12:12:24 +0100 Subject: [PATCH] Lua exports moved to lua dir --- radio/src/Makefile | 10 +++++----- radio/src/lua/api_general.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radio/src/Makefile b/radio/src/Makefile index 0a5c7bb47..8110caebd 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -1029,7 +1029,7 @@ ifeq ($(PCB), TARANIS) $(LUADIR)/lobject.c $(LUADIR)/lopcodes.c $(LUADIR)/lparser.c $(LUADIR)/lstate.c $(LUADIR)/lstring.c $(LUADIR)/ltable.c $(LUADIR)/lrotable.c $(LUADIR)/ltm.c $(LUADIR)/lundump.c $(LUADIR)/lvm.c $(LUADIR)/lzio.c \ $(LUADIR)/lbaselib.c $(LUADIR)/linit.c $(LUADIR)/lmathlib.c $(LUADIR)/lbitlib.c $(LUADIR)/loadlib.c $(LUADIR)/lauxlib.c $(LUADIR)/ltablib.c $(LUADIR)/lcorolib.c $(LUADIR)/liolib.c SRC += $(LUASRC) - LUADEP = lua_exports.inc + LUADEP = lua/lua_exports.inc ifeq ($(USE_BIN_ALLOCATOR), YES) CPPDEFS += -DUSE_BIN_ALLOCATOR CPPSRC += bin_allocator.cpp @@ -1637,11 +1637,11 @@ else PARSER = gcc -E -x c++ endif -lua_exports.inc: myeeprom.h ../util/luaexport.py +lua/lua_exports.inc: myeeprom.h ../util/luaexport.py @echo "Generating a list of Lua exported constants in lua_exports.txt" @$(PARSER) -DPCBTARANIS -DCPUARM -DCPUSTM32 -DLUA -DEXPORT myeeprom.h | grep LEXP > lua_exports.txt - @echo "Parsing and generating C Lua exports in lua_exports.inc" - @$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports.txt lua_exports.inc lua_fields.txt + @echo "Parsing and generating C Lua exports in lua/lua_exports.inc" + @$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports.txt lua/lua_exports.inc lua_fields.txt @rm lua_exports.txt # Eye candy. @@ -1803,7 +1803,7 @@ clean_list : $(REMOVE) bitmaps/*/*/*.lbm $(REMOVE) fonts/*.lbm $(REMOVE) fonts/*/*.lbm - $(REMOVE) lua_exports.txt lua_exports.inc lua_fields.txt + $(REMOVE) lua_exports.txt lua/lua_exports.inc lua_fields.txt $(MAKE) -C targets/taranis/bootloader clean #### Install diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index bcc6d1fc0..032962156 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -40,7 +40,7 @@ #include "stamp-opentx.h" #include "lua/lua_api.h" -#include "lua_exports.inc" // this line must be after lua headers +#include "lua/lua_exports.inc" // this line must be after lua headers #if defined(PCBTARANIS) && defined(REV9E) #define RADIO "taranisx9e"