diff --git a/LuaInterface/Lua/src/lua514.vcxproj b/LuaInterface/Lua/src/lua514.vcxproj
index 536d9ff782..dd43b824ac 100644
--- a/LuaInterface/Lua/src/lua514.vcxproj
+++ b/LuaInterface/Lua/src/lua514.vcxproj
@@ -5,14 +5,26 @@
Debug
Win32
+
+ Debug
+ x64
+
Release-LUAPERKS
Win32
+
+ Release-LUAPERKS
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}
@@ -29,58 +41,107 @@
v140_xp
true
+
+ DynamicLibrary
+ Unicode
+ v140_xp
+ true
+
DynamicLibrary
Unicode
v140_xp
true
+
+ DynamicLibrary
+ Unicode
+ v140_xp
+ true
+
DynamicLibrary
Unicode
v140_xp
+
+ DynamicLibrary
+ Unicode
+ v140_xp
+
+
+
+
+
+
+
+
+
+
<_ProjectFileVersion>10.0.40219.1
$(SolutionDir)$(Configuration)\
+ $(SolutionDir)$(Configuration)\
$(Configuration)\
+ $(Configuration)\
false
+ false
+
$(SolutionDir)$(Configuration)\
+ $(SolutionDir)$(Configuration)\
$(SolutionDir)$(Configuration)\
+ $(SolutionDir)$(Configuration)\
$(Configuration)\
+ $(Configuration)\
$(Configuration)\
+ $(Configuration)\
false
+ false
false
+ false
+
+
AllRules.ruleset
+ AllRules.ruleset
+
+
AllRules.ruleset
+ AllRules.ruleset
AllRules.ruleset
+ AllRules.ruleset
+
+
+
+
+
+
@@ -108,6 +169,31 @@
Windows
+
+
+ Disabled
+ $(ProjectDir)..\src;%(AdditionalIncludeDirectories)
+ LUA_BUILD_AS_DLL;%(PreprocessorDefinitions)
+ Async
+ MultiThreadedDebugDLL
+ 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
+ $(OutDir)$(TargetName).dll
+ true
+ true
+ $(OutDir)$(TargetName).pdb
+ false
+
+
+ $(OutDir)lua51.lib
+ Windows
+
+
%(AdditionalIncludeDirectories)
@@ -151,6 +237,48 @@
+
+
+ %(AdditionalIncludeDirectories)
+ MultiThreadedDLL
+ Level3
+ ProgramDatabase
+ 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
+ $(OutDir)lua51.dll
+ true
+ $(OutDir)$(TargetName).pdb
+ true
+ $(OutDir)$(TargetName).map
+ true
+ false
+
+
+ $(OutDir)lua51.lib
+ Windows
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
%(AdditionalIncludeDirectories)
@@ -194,6 +322,48 @@
+
+
+ %(AdditionalIncludeDirectories)
+ MultiThreadedDLL
+ Level3
+ ProgramDatabase
+ 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
+ $(OutDir)lua51.dll
+ true
+ $(OutDir)$(TargetName).pdb
+ true
+ $(OutDir)$(TargetName).map
+ true
+ false
+
+
+ $(OutDir)lua51.lib
+ Windows
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
@@ -203,13 +373,21 @@
false
+ false
false
+ false
true
+ true
true
+ true
true
+ true
false
+ false
false
+ false
false
+ false
@@ -241,11 +419,17 @@
Document
call $(ProjectDir)..\..\libs\un7z_and_touch.bat $(ProjectDir)\..\..\libs\ $(ProjectDir) luaperks.7z $(ProjectDir).libs\luaperks.lib $(ProjectDir).libs\luaperks.tag
+ call $(ProjectDir)..\..\libs\un7z_and_touch.bat $(ProjectDir)\..\..\libs\ $(ProjectDir) luaperks.7z $(ProjectDir).libs\luaperks.lib $(ProjectDir).libs\luaperks.tag
call $(ProjectDir)..\..\libs\un7z_and_touch.bat $(ProjectDir)\..\..\libs\ $(ProjectDir) luaperks.7z $(ProjectDir).libs\luaperks.lib $(ProjectDir).libs\luaperks.tag
+ call $(ProjectDir)..\..\libs\un7z_and_touch.bat $(ProjectDir)\..\..\libs\ $(ProjectDir) luaperks.7z $(ProjectDir).libs\luaperks.lib $(ProjectDir).libs\luaperks.tag
.libs\luaperks.tag
+ .libs\luaperks.tag
.libs\luaperks.tag
+ .libs\luaperks.tag
..\..\libs\7z.exe;..\..\libs\un7z_and_touch.bat
+ ..\..\libs\7z.exe;..\..\libs\un7z_and_touch.bat
..\..\libs\7z.exe;..\..\libs\un7z_and_touch.bat
+ ..\..\libs\7z.exe;..\..\libs\un7z_and_touch.bat
diff --git a/LuaInterface/LuaInterface.sln b/LuaInterface/LuaInterface.sln
index 56fb380ace..4063257da1 100644
--- a/LuaInterface/LuaInterface.sln
+++ b/LuaInterface/LuaInterface.sln
@@ -1,6 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2015
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
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}"
@@ -10,12 +12,18 @@ Global
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
Release-LUAPERKS|Any CPU = Release-LUAPERKS|Any CPU
Release-LUAPERKS|Mixed Platforms = Release-LUAPERKS|Mixed Platforms
Release-LUAPERKS|Win32 = Release-LUAPERKS|Win32
+ Release-LUAPERKS|x64 = Release-LUAPERKS|x64
+ Release-LUAPERKS|x86 = Release-LUAPERKS|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|Any CPU.ActiveCfg = Debug|Win32
@@ -23,31 +31,47 @@ Global
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|Win32.ActiveCfg = Debug|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|Win32.Build.0 = Debug|Win32
+ {0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|x64.ActiveCfg = Debug|x64
+ {0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Debug|x86.ActiveCfg = Debug|x64
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|Any CPU.ActiveCfg = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|Mixed Platforms.Build.0 = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|Win32.ActiveCfg = Release|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|Win32.Build.0 = Release|Win32
+ {0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|x64.ActiveCfg = Release|x64
+ {0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|x64.Build.0 = Release|x64
+ {0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release|x86.ActiveCfg = Release|x64
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|Any CPU.ActiveCfg = Release-LUAPERKS|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|Mixed Platforms.ActiveCfg = Release-LUAPERKS|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|Mixed Platforms.Build.0 = Release-LUAPERKS|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|Win32.ActiveCfg = Release-LUAPERKS|Win32
{0A82CC4C-9A27-461C-8DB0-A65AC6393748}.Release-LUAPERKS|Win32.Build.0 = Release-LUAPERKS|Win32
+ {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
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|x64.ActiveCfg = Debug|x64
+ {F55CABBB-4108-4A39-94E1-581FD46DC021}.Debug|x86.ActiveCfg = Debug|x86
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|Any CPU.Build.0 = Release|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|Win32.ActiveCfg = Release|Any CPU
+ {F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|x64.ActiveCfg = Release|x64
+ {F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|x64.Build.0 = Release|x64
+ {F55CABBB-4108-4A39-94E1-581FD46DC021}.Release|x86.ActiveCfg = Release|x86
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|Any CPU.ActiveCfg = Release-LUAPERKS|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|Any CPU.Build.0 = Release-LUAPERKS|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|Mixed Platforms.ActiveCfg = Release-LUAPERKS|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|Mixed Platforms.Build.0 = Release-LUAPERKS|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.Release-LUAPERKS|Win32.ActiveCfg = Release-LUAPERKS|Any CPU
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/LuaInterface/LuaInterface/LuaInterface.csproj b/LuaInterface/LuaInterface/LuaInterface.csproj
index 433b1dcdd9..16029ce38c 100644
--- a/LuaInterface/LuaInterface/LuaInterface.csproj
+++ b/LuaInterface/LuaInterface/LuaInterface.csproj
@@ -84,6 +84,98 @@
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets
;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ ..\..\references\LuaInterface.dll.CodeAnalysisLog.xml
+ true
+ GlobalSuppressions.cs
+ false
+ prompt
+ AllRules.ruleset
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ ..\..\references\LuaInterface.dll.CodeAnalysisLog.xml
+ true
+ GlobalSuppressions.cs
+ false
+ prompt
+ AllRules.ruleset
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
+
+
+ bin\x86\Release-LUAPERKS\
+ TRACE
+ true
+ pdbonly
+ x86
+ ..\..\references\LuaInterface.dll.CodeAnalysisLog.xml
+ true
+ GlobalSuppressions.cs
+ false
+ prompt
+ AllRules.ruleset
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
+
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ ..\..\references\LuaInterface.dll.CodeAnalysisLog.xml
+ true
+ GlobalSuppressions.cs
+ false
+ prompt
+ AllRules.ruleset
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ ..\..\references\LuaInterface.dll.CodeAnalysisLog.xml
+ true
+ GlobalSuppressions.cs
+ false
+ prompt
+ AllRules.ruleset
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
+ false
+ false
+
+
+ bin\x64\Release-LUAPERKS\
+ TRACE
+ true
+ pdbonly
+ x64
+ ..\..\references\LuaInterface.dll.CodeAnalysisLog.xml
+ true
+ GlobalSuppressions.cs
+ false
+ prompt
+ AllRules.ruleset
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets
+ ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
+
diff --git a/References/x64/LuaInterface.dll b/References/x64/LuaInterface.dll
new file mode 100644
index 0000000000..ff511a4b97
Binary files /dev/null and b/References/x64/LuaInterface.dll differ
diff --git a/References/x64/lua51.dll b/References/x64/lua51.dll
new file mode 100644
index 0000000000..e610c033e3
Binary files /dev/null and b/References/x64/lua51.dll differ
diff --git a/References/lua51.dll b/References/x86/lua51.dll
similarity index 100%
rename from References/lua51.dll
rename to References/x86/lua51.dll