1
0
mirror of https://github.com/elua/elua.git synced 2025-01-25 01:02:54 +08:00

Merge branch 'master' of github.com:gabrield/elua into gabrield-master

Conflicts:
	src/lua/luaconf.h
This commit is contained in:
naves.thiago 2013-08-31 16:07:42 -03:00
commit c9faaef73e

View File

@ -92,7 +92,7 @@
#ifndef LUA_RPC
#ifndef LUA_PATH_DEFAULT
#define LUA_PATH_DEFAULT "/rfs/?.lua;/rfs/?.lc;/mmc/?.lua;/mmc/?.lc;/wo/?.lua;/wo/?.lc;/rom/?.lua;/rom/?.lc"
#define LUA_PATH_DEFAULT "/rfs/?.lua;/rfs/?.lc;/mmc/?.lua;/mmc/?.lc;/wo/?.lua;/wo/?.lc;/rom/?.lua;/rom/?.lc;/semi/?.lua;/semi/?.lc;"
#endif
#define LUA_CPATH_DEFAULT ""
@ -112,7 +112,7 @@
#ifndef LUA_RPC
#ifndef LUA_PATH_DEFAULT
#define LUA_PATH_DEFAULT "/mmc/?.lua;/mmc/?.lc;/wo/?.lua;/wo/?.lc;/rom/?.lua;/rom/?.lc"
#define LUA_PATH_DEFAULT "/mmc/?.lua;/mmc/?.lc;/wo/?.lua;/wo/?.lc;/rom/?.lua;/rom/?.lc;/semi/?.lua;/semi/?.lc;"
#endif
#define LUA_CPATH_DEFAULT ""
#else // #ifndef LUA_RPC