summaryrefslogtreecommitdiffstats
path: root/lib/lua
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-03-01 18:48:44 +0100
committerTycho <work.tycho+git@gmail.com>2014-03-01 18:48:44 +0100
commit0d26e81ab56f7a945af23034878e0487aa65800f (patch)
tree2acb54403850d8225d9d445e97ede81fe12c5934 /lib/lua
parentFinal implementation of MetaRotater (diff)
parentMerge pull request #735 from xdot/master (diff)
downloadcuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar
cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar.gz
cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar.bz2
cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar.lz
cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar.xz
cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.tar.zst
cuberite-0d26e81ab56f7a945af23034878e0487aa65800f.zip
Diffstat (limited to 'lib/lua')
-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()