From dfc139376a8b0648ca2419210aa0b0e8b2758994 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sun, 20 Dec 2015 05:04:11 -0600 Subject: [PATCH] fix lua dlls on windows xp after changing to vs2015 building --- LuaInterface/Lua/src/lua514.vcxproj | 3 +++ LuaInterface/LuaInterface.sln | 2 +- References/lua51.dll | Bin 213504 -> 213504 bytes 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/LuaInterface/Lua/src/lua514.vcxproj b/LuaInterface/Lua/src/lua514.vcxproj index 33a9324ea5..536d9ff782 100644 --- a/LuaInterface/Lua/src/lua514.vcxproj +++ b/LuaInterface/Lua/src/lua514.vcxproj @@ -92,6 +92,7 @@ Level3 ProgramDatabase 4996;%(DisableSpecificWarnings) + /Zc:threadSafeInit- %(AdditionalOptions) gdi32.lib;opengl32.lib;shell32.lib;user32.lib;comctl32.lib;kernel32.lib;ws2_32.lib;psapi.lib;AdvAPI32.Lib;ole32.lib;mpr.lib;comdlg32.lib;WinSpool.Lib @@ -116,6 +117,7 @@ 4996;%(DisableSpecificWarnings) Cdecl _WINDLL;%(PreprocessorDefinitions) + /Zc:threadSafeInit- %(AdditionalOptions) .libs\luaperks.lib;gdi32.lib;opengl32.lib;shell32.lib;user32.lib;comctl32.lib;kernel32.lib;ws2_32.lib;psapi.lib;AdvAPI32.Lib;ole32.lib;mpr.lib;comdlg32.lib;WinSpool.Lib @@ -158,6 +160,7 @@ 4996;%(DisableSpecificWarnings) Cdecl LUAPERKS;_WINDLL;%(PreprocessorDefinitions) + /Zc:threadSafeInit- %(AdditionalOptions) .libs\luaperks.lib;gdi32.lib;opengl32.lib;shell32.lib;user32.lib;comctl32.lib;kernel32.lib;ws2_32.lib;psapi.lib;AdvAPI32.Lib;ole32.lib;mpr.lib;comdlg32.lib;WinSpool.Lib diff --git a/LuaInterface/LuaInterface.sln b/LuaInterface/LuaInterface.sln index 50776a5a8e..56fb380ace 100644 --- a/LuaInterface/LuaInterface.sln +++ b/LuaInterface/LuaInterface.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +# Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "Lua\src\lua514.vcxproj", "{0A82CC4C-9A27-461C-8DB0-A65AC6393748}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuaInterface", "LuaInterface\LuaInterface.csproj", "{F55CABBB-4108-4A39-94E1-581FD46DC021}" diff --git a/References/lua51.dll b/References/lua51.dll index 4e4316442dea1fca46982e1d135108574d300808..22650d2c6f1a98e93c699e8b4c7f5a6daea4617c 100644 GIT binary patch delta 158 zcmZo@;caN)-5|lp{GqF?S(>q3nvrq4G$WH{wlz>7i~$IkfY=R)D@2(YDma-zLJTlD z9w1u;hz|he4j|;F*XJ-vf=t{#JBP`)M?mGAcIf{uA+L#Sg^BCiJ$bhO_`%d7AZQ>E jbl{>?ig)_~)s0)M->@=m@8x8k&cgg2s8OAd`KB=dZDuX^ delta 158 zcmZo@;caN)-5|lpyzgmYvovG7G$Z47X+|c^Y-^xE7y}S60kInpSBNq*RB$qbgcx9Q zJV3Sx5FY@_9YDxUug_tU1ev&fb`FzokHBdrvjhE+(|lWR-kEz*(qYH;A3vB{1O)xh i`9E+wd)I0HoB*Gi&HtSkxA$@~PiFyZROe&9X$$~FfikB6