Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-16 04:45:17 +03:00
Code Issues Wiki Activity

Lua exports moved to lua dir

Browse source
This commit is contained in:
Damjan Adamic 2015-11-15 12:12:24 +01:00
parent d54f25ccba
commit 4a60c8aa6e
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radio/src/Makefile
View file

@ -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)/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 $(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) SRC += $(LUASRC)
LUADEP = lua_exports.inc LUADEP = lua/lua_exports.inc
ifeq ($(USE_BIN_ALLOCATOR), YES) ifeq ($(USE_BIN_ALLOCATOR), YES)
CPPDEFS += -DUSE_BIN_ALLOCATOR CPPDEFS += -DUSE_BIN_ALLOCATOR
CPPSRC += bin_allocator.cpp CPPSRC += bin_allocator.cpp
@ -1637,11 +1637,11 @@ else
PARSER = gcc -E -x c++ PARSER = gcc -E -x c++
endif 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" @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 @$(PARSER) -DPCBTARANIS -DCPUARM -DCPUSTM32 -DLUA -DEXPORT myeeprom.h | grep LEXP > lua_exports.txt
@echo "Parsing and generating C Lua exports in lua_exports.inc" @echo "Parsing and generating C Lua exports in lua/lua_exports.inc"
@$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports.txt lua_exports.inc lua_fields.txt @$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports.txt lua/lua_exports.inc lua_fields.txt
@rm lua_exports.txt @rm lua_exports.txt
# Eye candy. # Eye candy.
@ -1803,7 +1803,7 @@ clean_list :
$(REMOVE) bitmaps/*/*/*.lbm $(REMOVE) bitmaps/*/*/*.lbm
$(REMOVE) fonts/*.lbm $(REMOVE) fonts/*.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 $(MAKE) -C targets/taranis/bootloader clean
#### Install #### Install

2
radio/src/lua/api_general.cpp
View file

@ -40,7 +40,7 @@
#include "stamp-opentx.h" #include "stamp-opentx.h"
#include "lua/lua_api.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) #if defined(PCBTARANIS) && defined(REV9E)
#define RADIO "taranisx9e" #define RADIO "taranisx9e"