From 79cdfaba6bb7012bb41c3dd59584d5d319c18a30 Mon Sep 17 00:00:00 2001 From: zeromus Date: Fri, 3 Feb 2017 01:21:38 -0600 Subject: [PATCH] add (or fix, not sure which) luaperks-building version of our luainterface, but dont use it just yet--we'll wait for some need. turns out luasockets isnt worth the trouble of embedding due to the dependency on a bunch of other files anyway --- LuaInterface/Lua/src/lua514.vcxproj | 2 +- LuaInterface/LuaInterface.sln | 4 +++- LuaInterface/LuaInterface/LuaInterface.csproj | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/LuaInterface/Lua/src/lua514.vcxproj b/LuaInterface/Lua/src/lua514.vcxproj index 9f89c43ae6..7e403a4035 100644 --- a/LuaInterface/Lua/src/lua514.vcxproj +++ b/LuaInterface/Lua/src/lua514.vcxproj @@ -291,7 +291,7 @@ /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 + legacy_stdio_definitions.lib;.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 $(OutDir)lua51.dll true $(OutDir)$(TargetName).pdb diff --git a/LuaInterface/LuaInterface.sln b/LuaInterface/LuaInterface.sln index 802afdddd4..914ee3ef03 100644 --- a/LuaInterface/LuaInterface.sln +++ b/LuaInterface/LuaInterface.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "Lua\src\lua514.vcxproj", "{0A82CC4C-9A27-461C-8DB0-A65AC6393748}" EndProject @@ -28,6 +28,7 @@ Global {0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|x64.ActiveCfg = Release-LUAPERKS|x64 {0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|x64.Build.0 = Release-LUAPERKS|x64 {0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|x86.ActiveCfg = Release-LUAPERKS|Win32 + {0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|x86.Build.0 = Release-LUAPERKS|Win32 {F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|x64.ActiveCfg = Debug|x64 {F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|x64.Build.0 = Debug|x64 {F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|x86.ActiveCfg = Debug|x86 @@ -39,6 +40,7 @@ Global {F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|x64.ActiveCfg = Release-LUAPERKS|x64 {F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|x64.Build.0 = Release-LUAPERKS|x64 {F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|x86.ActiveCfg = Release-LUAPERKS|x86 + {F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|x86.Build.0 = Release-LUAPERKS|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LuaInterface/LuaInterface/LuaInterface.csproj b/LuaInterface/LuaInterface/LuaInterface.csproj index 65f895e1fc..3b3aad27d1 100644 --- a/LuaInterface/LuaInterface/LuaInterface.csproj +++ b/LuaInterface/LuaInterface/LuaInterface.csproj @@ -115,7 +115,7 @@ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - bin\x86\Release-LUAPERKS\ + ..\..\references\x86\ TRACE true pdbonly