summaryrefslogtreecommitdiff
path: root/depends/lua
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-03-31 15:40:54 +0400
committerAlexander Gavrilov2012-03-31 15:40:54 +0400
commit0f41608ed4b808205dd8734bbc52de64f6501c98 (patch)
tree63229bc9c5cf3c37be28b062bae951bcfae8fb33 /depends/lua
parent9384f0c842f817bf810b34e44bfa3be913e7e3fc (diff)
downloaddfhack-0f41608ed4b808205dd8734bbc52de64f6501c98.tar.gz
dfhack-0f41608ed4b808205dd8734bbc52de64f6501c98.tar.bz2
dfhack-0f41608ed4b808205dd8734bbc52de64f6501c98.tar.xz
Pull console output support and REPL out of dfusion into core lib.
Diffstat (limited to 'depends/lua')
-rw-r--r--depends/lua/include/luaconf.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/depends/lua/include/luaconf.h b/depends/lua/include/luaconf.h
index 7a3a03d3..fca66ce4 100644
--- a/depends/lua/include/luaconf.h
+++ b/depends/lua/include/luaconf.h
@@ -89,25 +89,21 @@
** In Windows, any exclamation mark ('!') in the path is replaced by the
** path of the directory of the executable file of the current process.
*/
-#define LUA_LDIR "!\\lua\\"
+#define LUA_LDIR "!\\hack\\lua\\"
#define LUA_CDIR "!\\"
#define LUA_PATH_DEFAULT \
- LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \
- LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua;" ".\\?.lua"
+ LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" ".\\?.lua"
#define LUA_CPATH_DEFAULT \
- LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll;" ".\\?.dll"
+ LUA_CDIR"?.dll;" ".\\?.dll"
#else /* }{ */
-#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
-#define LUA_ROOT "/usr/local/"
-#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR
-#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR
+#define LUA_LDIR "./hack/lua/"
+#define LUA_CDIR "./hack/"
#define LUA_PATH_DEFAULT \
- LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
- LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" "./?.lua"
+ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" "./?.lua"
#define LUA_CPATH_DEFAULT \
- LUA_CDIR"?.so;" LUA_CDIR"loadall.so;" "./?.so"
+ LUA_CDIR"?.so;" "./?.so"
#endif /* } */