summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-02-28 08:26:39 +0100
committermadmaxoft <github@xoft.cz>2014-02-28 08:27:02 +0100
commit6a191cce0af0056ecde69efe1679a084aadd810c (patch)
tree124d13318ed45d3d44ccac7cabef2e5c1580b05d /lib
parentMerge pull request #730 from tonibm19/master (diff)
downloadcuberite-6a191cce0af0056ecde69efe1679a084aadd810c.tar
cuberite-6a191cce0af0056ecde69efe1679a084aadd810c.tar.gz
cuberite-6a191cce0af0056ecde69efe1679a084aadd810c.tar.bz2
cuberite-6a191cce0af0056ecde69efe1679a084aadd810c.tar.lz
cuberite-6a191cce0af0056ecde69efe1679a084aadd810c.tar.xz
cuberite-6a191cce0af0056ecde69efe1679a084aadd810c.tar.zst
cuberite-6a191cce0af0056ecde69efe1679a084aadd810c.zip
Diffstat (limited to '')
-rw-r--r--lib/lua/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/lua/CMakeLists.txt b/lib/lua/CMakeLists.txt
index 4babae9b2..db112d557 100644
--- a/lib/lua/CMakeLists.txt
+++ b/lib/lua/CMakeLists.txt
@@ -47,8 +47,12 @@ if (WIN32)
)
endif()
+ set_target_properties(lua PROPERTIES OUTPUT_NAME "lua51")
+
# NOTE: The DLL for each configuration is stored at the same place, thus overwriting each other.
- # This is known, however such behavior is needed for LuaRocks - they always load "lua.dll"
+ # This is known, however such behavior is needed for LuaRocks - they always load "lua5.1.dll" or "lua51.dll"
+ # We make it work by compiling to "lua51.dll" and providing a proxy-DLL "lua5.1.dll"
+ # See http://lua-users.org/wiki/LuaProxyDllFour for details
else()
add_library(lua ${SOURCE})
endif()