From 6a191cce0af0056ecde69efe1679a084aadd810c Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Fri, 28 Feb 2014 08:26:39 +0100 Subject: [PATCH] Fixed compatibility with ZeroBraneStudio and LuaRocks. Lua now compiles into lua51.dll and there's a lua5.1.dll that acts as a export-forwarding proxy to lua51.dll. --- MCServer/lua5.1.dll | Bin 0 -> 6722 bytes lib/lua/CMakeLists.txt | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 MCServer/lua5.1.dll diff --git a/MCServer/lua5.1.dll b/MCServer/lua5.1.dll new file mode 100644 index 0000000000000000000000000000000000000000..cca0bcb251b4e9a603c4a0e2eb4e926dab6fa25d GIT binary patch literal 6722 zcmeI1ZHyJw8OQ&yD+qK!i$ZBp?~1&v=!F$%v2QHuV$r35EaLkxckbM~8Zid{=gfJVwdu#E zNtxt#=XuWaKWEOIm*?EOyX~g?&^rD5+hweOIlMHpBYBz}$;e(>q3iu^D|>Fgmmo zUj=5e{B6wYn>SnLBw5NJNU`+Ex&|(FQBICv9hW!Z!B&v zq;>>2hqwRsRnNmab3Rn|MSO@C7dTf9YxmZ}rl0$&uQdimXU)r&;t{MJsYj(wzRL*9 zMO$Af9d5_Gw6c{3#iBIk!hsp2Baq=-auMUioNpg_ragvim&eaJN90NJ zI{B0=8sEcKT!U*dhHdyhwqpl&;yUcYICkTD z?7`H2~u=%2jartP#>;0<5-%*bry_y zezO_(@+?Z)qI9~y!K$W-tm|m@`Ee1Nc8q5fSv$JC{bWih9Iv8?l00O09F3T5d?occ{M=XwaMzN>0Qx-&wfJy&7Z=a?rn*4L^e+%J0U zyx8;-N6C@T)$3DbJgrE(VG>8`wH#+!yjQ-r5=hS~a%cUGd16J_73!#*wI@}M@2Kp; zlOpSCO*ad>?pRlSqbhn6S=cLLwIjO~U#qgPRlb-qYA#Lb#vANAA`?q_}3*xjVA8IXKJ52&# z4wM%dQ^&gcQC?t79m_&4F0&53pz14Cv*>hXpS7XN!#fJUd>Lcuh#pzbjIoNe%Yi9x zx{N)D<1~;{>2dQ~&njABvQKt`acw(Mz4=9TlL>5mB28sB6Jc#vqd{6E{<3&~9sBB`O#5yK!(DiDdJDD#&mWNv|@YuQnkGRJpR&RHQ< zj_;`As6COpV<5F(D0OR0d-@kn8`(kJnf4g#IvP8{vK{L> z8oOmgUySD}oB@>W>~ji~F7x-BWa_z&jdMrJRl}$S{T1@-nkT;cm8Od2sk6Vm zif0tnT%7Zeb#k*&IeV7vIG#~ByN?RTGYV&~<*9W{yer$4zk1k$;~9nBRuovr#4G6| zPhD4Q)bA0m`b$K*iLX|oh-pXFyVERiW2wlLUR7Rci688zuhS#&KRE*Z?3MVxf%rdA c`7emGDkbOB^SrH_$GtFVdY-bGSF)Vm=Y$7hZ~y=R literal 0 HcmV?d00001 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()