Updated to Diligent Engine 2.0

16 files changed, 319 insertions, 452 deletions

diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj b/External/lua-5.2.3/build/UWP/Lua.vcxproj
index a88c87e..5c2e3ad 100644
--- a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj
+++ b/External/lua-5.2.3/build/UWP/Lua.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -27,76 +27,83 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{5110a62b-172f-48fe-a268-4931577d9aad}</ProjectGuid>
+    <ProjectGuid>{25ec9b99-84dc-488b-b175-7888a6fda6a2}</ProjectGuid>
+    <Keyword>StaticLibrary</Keyword>
     <RootNamespace>Lua</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
-    <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\Lua.Shared\Lua.Shared.vcxitems" Label="Shared" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+    <Import Project="..\Windows.Shared\Lua.Shared.vcxitems" Label="Shared" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" />
+    <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Dbg.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" />
+    <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Rel.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" />
+    <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmDbg.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" />
+    <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmRel.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Dbg.props" />
+    <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Dbg.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Rel.props" />
+    <Import Project="..\..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Rel.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
@@ -117,11 +124,11 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAs>CompileAsCpp</CompileAs>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -131,11 +138,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAs>CompileAsCpp</CompileAs>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -145,11 +152,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
     <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAs>CompileAsCpp</CompileAs>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -159,11 +166,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
     <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAs>CompileAsCpp</CompileAs>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -173,11 +180,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAs>CompileAsCpp</CompileAs>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4334</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -187,11 +195,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAs>CompileAsCpp</CompileAs>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4334</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/External/lua-5.2.3/build/UWP/Lua.vcxproj.filters b/External/lua-5.2.3/build/UWP/Lua.vcxproj.filters
new file mode 100644
index 0000000..c31757e
--- /dev/null
+++ b/External/lua-5.2.3/build/UWP/Lua.vcxproj.filters
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
diff --git a/External/lua-5.2.3/build/Windows/Lua-Debug.vgdbsettings b/External/lua-5.2.3/build/Win32/Lua-Debug.vgdbsettings
index 3f5b24b..3f5b24b 100644
--- a/External/lua-5.2.3/build/Windows/Lua-Debug.vgdbsettings
+++ b/External/lua-5.2.3/build/Win32/Lua-Debug.vgdbsettings
diff --git a/External/lua-5.2.3/build/Windows/Lua-Release.vgdbsettings b/External/lua-5.2.3/build/Win32/Lua-Release.vgdbsettings
index 669691f..669691f 100644
--- a/External/lua-5.2.3/build/Windows/Lua-Release.vgdbsettings
+++ b/External/lua-5.2.3/build/Win32/Lua-Release.vgdbsettings
diff --git a/External/lua-5.2.3/build/Windows/Lua.vcxproj b/External/lua-5.2.3/build/Win32/Lua.vcxproj
index 67ff315..50ce1b8 100644
--- a/External/lua-5.2.3/build/Windows/Lua.vcxproj
+++ b/External/lua-5.2.3/build/Win32/Lua.vcxproj
@@ -67,7 +67,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\WindowsStore\Lua.Shared\Lua.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\Lua.Shared\Lua.Shared.vcxitems')" />
+    <Import Project="..\Windows.Shared\Lua.Shared.vcxitems" Label="Shared" Condition="Exists('..\Windows.Shared\Lua.Shared.vcxitems')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -125,6 +125,7 @@
       <CompileAs>CompileAsCpp</CompileAs>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile />
+      <DisableSpecificWarnings>4100;4505;4334</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -159,6 +160,7 @@
       <CompileAs>CompileAsCpp</CompileAs>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile />
+      <DisableSpecificWarnings>4100;4505;4334</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/External/lua-5.2.3/build/Windows/Lua.vcxproj.filters b/External/lua-5.2.3/build/Win32/Lua.vcxproj.filters
index 7995534..7995534 100644
--- a/External/lua-5.2.3/build/Windows/Lua.vcxproj.filters
+++ b/External/lua-5.2.3/build/Win32/Lua.vcxproj.filters
diff --git a/External/lua-5.2.3/build/Windows/jni/Android.mk b/External/lua-5.2.3/build/Win32/jni/Android.mk
index e37ae2b..e37ae2b 100644
--- a/External/lua-5.2.3/build/Windows/jni/Android.mk
+++ b/External/lua-5.2.3/build/Win32/jni/Android.mk
diff --git a/External/lua-5.2.3/build/Windows/jni/Application.mk b/External/lua-5.2.3/build/Win32/jni/Application.mk
index 40e89bb..40e89bb 100644
--- a/External/lua-5.2.3/build/Windows/jni/Application.mk
+++ b/External/lua-5.2.3/build/Win32/jni/Application.mk
diff --git a/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems
new file mode 100644
index 0000000..893301e
--- /dev/null
+++ b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <ItemsProjectGuid>{4703c34c-1a7f-4bb2-8ff8-007c55c015d5}</ItemsProjectGuid>
+    <ItemsRootNamespace>Lua</ItemsRootNamespace>
+    <ItemsProjectName>Lua.Shared</ItemsProjectName>
+    <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectCapability Include="SourceItemsFromImports" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lapi.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lauxlib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lbaselib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lbitlib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lcode.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lcorolib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lctype.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldblib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldebug.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldo.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldump.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lfunc.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lgc.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\linit.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\liolib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\llex.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lmathlib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lmem.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\loadlib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lobject.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lopcodes.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\loslib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lparser.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstate.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstring.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstrlib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltable.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltablib.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltm.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lundump.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lvm.c" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lzio.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lapi.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lauxlib.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lcode.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lctype.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ldebug.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ldo.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lfunc.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lgc.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\llex.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\llimits.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lmem.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lobject.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lopcodes.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lparser.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lstate.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lstring.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ltable.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ltm.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lua.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lua.hpp" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\luaconf.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lualib.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lundump.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lvm.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\winappstubs.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt">
+      <DeploymentContent>false</DeploymentContent>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems.filters b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems.filters
new file mode 100644
index 0000000..c637b23
--- /dev/null
+++ b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems.filters
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="include">
+      <UniqueIdentifier>{49cb749b-a0fb-4a8c-ae92-c64623bcc2ab}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src">
+      <UniqueIdentifier>{914d194a-480c-4f8d-a190-bd036d9622e9}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lundump.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lvm.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lzio.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltm.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstring.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstrlib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltable.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ltablib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lopcodes.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\loslib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lparser.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lstate.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lmathlib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lmem.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\loadlib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lobject.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lgc.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\linit.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\liolib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\llex.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldebug.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldo.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldump.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lfunc.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\ldblib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lctype.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lcorolib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lcode.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lbitlib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lapi.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lauxlib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\lbaselib.c">
+      <Filter>src</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lcode.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lapi.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lauxlib.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\luaconf.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lualib.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lundump.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lvm.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ltm.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lua.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lua.hpp">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lstate.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lstring.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ltable.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lopcodes.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lparser.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lmem.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lobject.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lgc.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\llex.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\llimits.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ldebug.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\ldo.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lfunc.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\lctype.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\src\winappstubs.h">
+      <Filter>include</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems b/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems
deleted file mode 100644
index fba2720..0000000
--- a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <ItemsProjectGuid>{4703c34c-1a7f-4bb2-8ff8-007c55c015d5}</ItemsProjectGuid>
-    <ItemsRootNamespace>Lua</ItemsRootNamespace>
-    <ItemsProjectName>Lua.Shared</ItemsProjectName>
-    <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectCapability Include="SourceItemsFromImports" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lapi.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lauxlib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lbaselib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lbitlib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lcode.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lcorolib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lctype.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldblib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldebug.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldo.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldump.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lfunc.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lgc.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\linit.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\liolib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\llex.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lmathlib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lmem.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\loadlib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lobject.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lopcodes.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\loslib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lparser.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstate.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstring.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstrlib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltable.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltablib.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltm.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lundump.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lvm.c" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lzio.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lapi.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lauxlib.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lcode.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lctype.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ldebug.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ldo.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lfunc.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lgc.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\llex.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\llimits.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lmem.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lobject.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lopcodes.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lparser.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lstate.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lstring.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ltable.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ltm.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lua.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lua.hpp" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\luaconf.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lualib.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lundump.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lvm.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\winappstubs.h" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems.filters b/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems.filters
deleted file mode 100644
index 27d88a9..0000000
--- a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems.filters
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{49cb749b-a0fb-4a8c-ae92-c64623bcc2ab}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{914d194a-480c-4f8d-a190-bd036d9622e9}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lundump.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lvm.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lzio.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltm.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstring.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstrlib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltable.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ltablib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lopcodes.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\loslib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lparser.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lstate.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lmathlib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lmem.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\loadlib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lobject.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lgc.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\linit.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\liolib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\llex.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldebug.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldo.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldump.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lfunc.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\ldblib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lctype.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lcorolib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lcode.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lbitlib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lapi.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lauxlib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\lbaselib.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lcode.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lapi.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lauxlib.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\luaconf.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lualib.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lundump.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lvm.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ltm.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lua.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lua.hpp">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lstate.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lstring.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ltable.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lopcodes.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lparser.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lmem.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lobject.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lgc.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\llex.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\llimits.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ldebug.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\ldo.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lfunc.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\lctype.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\winappstubs.h">
-      <Filter>include</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj.filters b/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj.filters
deleted file mode 100644
index a7761ab..0000000
--- a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj.filters
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<ItemGroup>
-	</ItemGroup>
-</Project>
diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj b/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj
deleted file mode 100644
index ec044d3..0000000
--- a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6536c1f5-4ea4-49a3-92f1-810c4750bf10}</ProjectGuid>
-    <RootNamespace>Lua</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Phone</ApplicationType>
-    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
-    <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\Lua.Shared\Lua.Shared.vcxitems" Label="Shared" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj.filters b/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj.filters
deleted file mode 100644
index a7761ab..0000000
--- a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj.filters
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<ItemGroup>
-	</ItemGroup>
-</Project>
diff --git a/External/lua-5.2.3/src/luaconf.h b/External/lua-5.2.3/src/luaconf.h
index 73bac22..19989bf 100644
--- a/External/lua-5.2.3/src/luaconf.h
+++ b/External/lua-5.2.3/src/luaconf.h
@@ -549,7 +549,7 @@
 #   define getlocaledecpoint() '.' 
 #endif
 
-#ifdef _WINDOWS_STORE
+#ifdef PLATFORM_UNIVERSAL_WINDOWS
 #   include "winappstubs.h"
 #endif