summaryrefslogtreecommitdiff
path: root/depends/lua
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-06-17 16:01:08 +0400
committerAlexander Gavrilov2012-06-17 16:01:46 +0400
commiteeaae916edc28baa065e277acde69b0674fd3fd2 (patch)
tree253bb3a9f1a22bb8da9c8b5a41db777fd7908d04 /depends/lua
parent534367546d137998231ca95103c7ec0d260bdc13 (diff)
downloaddfhack-eeaae916edc28baa065e277acde69b0674fd3fd2.tar.gz
dfhack-eeaae916edc28baa065e277acde69b0674fd3fd2.tar.bz2
dfhack-eeaae916edc28baa065e277acde69b0674fd3fd2.tar.xz
Reapply dfhack-specific lua build configuration.
Diffstat (limited to 'depends/lua')
-rw-r--r--depends/lua/include/luaconf.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/depends/lua/include/luaconf.h b/depends/lua/include/luaconf.h
index e4335df9..766752ff 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 /* } */
@@ -142,11 +138,15 @@
*/
#if defined(LUA_BUILD_AS_DLL) /* { */
+#if defined(_MSC_VER)
#if defined(LUA_CORE) || defined(LUA_LIB) /* { */
#define LUA_API __declspec(dllexport)
#else /* }{ */
#define LUA_API __declspec(dllimport)
#endif /* } */
+#else
+#define LUA_API __attribute__ ((visibility("default")))
+#endif
#else /* }{ */