*misc

6 files changed, 144 insertions, 12 deletions

diff --git a/build/vc++/3rdparty/luax/luax.vcxproj b/build/vc++/3rdparty/luax/luax.vcxproj
new file mode 100644
index 0000000..354e437
--- /dev/null
+++ b/build/vc++/3rdparty/luax/luax.vcxproj
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{C6B16179-5640-4D41-8756-0525D25EB569}</ProjectGuid>
+    <RootNamespace>luax</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup 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" />
+  </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" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\3rdparty\luax\luax.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/build/vc++/3rdparty/luax/luax.vcxproj.filters b/build/vc++/3rdparty/luax/luax.vcxproj.filters
new file mode 100644
index 0000000..0fb5905
--- /dev/null
+++ b/build/vc++/3rdparty/luax/luax.vcxproj.filters
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\3rdparty\luax\luax.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/vc++/3rdparty/luax/luax.vcxproj.user b/build/vc++/3rdparty/luax/luax.vcxproj.user
new file mode 100644
index 0000000..be25078
--- /dev/null
+++ b/build/vc++/3rdparty/luax/luax.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file
diff --git a/build/vc++/jin.sln b/build/vc++/jin.sln
index 326f92a..ed41fc7 100644
--- a/build/vc++/jin.sln
+++ b/build/vc++/jin.sln
@@ -45,6 +45,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaJIT-2.0.5", "3rdparty\Lu
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml2", "3rdparty\tinyxml2\tinyxml2.vcxproj", "{A5B92785-7D5A-4910-AA54-C0872F3C605D}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luax", "3rdparty\luax\luax.vcxproj", "{C6B16179-5640-4D41-8756-0525D25EB569}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -173,6 +175,14 @@ Global
 		{A5B92785-7D5A-4910-AA54-C0872F3C605D}.Release|x64.Build.0 = Release|x64
 		{A5B92785-7D5A-4910-AA54-C0872F3C605D}.Release|x86.ActiveCfg = Release|Win32
 		{A5B92785-7D5A-4910-AA54-C0872F3C605D}.Release|x86.Build.0 = Release|Win32
+		{C6B16179-5640-4D41-8756-0525D25EB569}.Debug|x64.ActiveCfg = Debug|x64
+		{C6B16179-5640-4D41-8756-0525D25EB569}.Debug|x64.Build.0 = Debug|x64
+		{C6B16179-5640-4D41-8756-0525D25EB569}.Debug|x86.ActiveCfg = Debug|Win32
+		{C6B16179-5640-4D41-8756-0525D25EB569}.Debug|x86.Build.0 = Debug|Win32
+		{C6B16179-5640-4D41-8756-0525D25EB569}.Release|x64.ActiveCfg = Release|x64
+		{C6B16179-5640-4D41-8756-0525D25EB569}.Release|x64.Build.0 = Release|x64
+		{C6B16179-5640-4D41-8756-0525D25EB569}.Release|x86.ActiveCfg = Release|Win32
+		{C6B16179-5640-4D41-8756-0525D25EB569}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -195,6 +205,7 @@ Global
 		{3191C07B-085A-46BC-9436-469B4E2BF5F0} = {6FC112F9-B317-4444-B4FB-2E0BF70328F1}
 		{45AC0438-98A8-4369-A21D-BBCBE7995B34} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2}
 		{A5B92785-7D5A-4910-AA54-C0872F3C605D} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92}
+		{C6B16179-5640-4D41-8756-0525D25EB569} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {633D8D43-3349-43F7-8835-7D7F58BAD2A8}
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index c59405e..ecd048c 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -153,7 +153,6 @@
     <ClInclude Include="..\..\..\src\libjin\Common\je_stringmap.hpp" />
     <ClInclude Include="..\..\..\src\libjin\Common\je_subsystem.hpp" />
     <ClInclude Include="..\..\..\src\libjin\Common\je_types.h" />
-    <ClInclude Include="..\..\..\src\libjin\Common\je_utf8.h" />
     <ClInclude Include="..\..\..\src\libjin\core\je_configuration.h" />
     <ClInclude Include="..\..\..\src\libjin\core\je_version.h" />
     <ClInclude Include="..\..\..\src\libjin\Filesystem\je_buffer.h" />
@@ -223,7 +222,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\libjin\core\README.md" />
-    <None Include="..\..\..\src\libjin\math\README.md" />
     <None Include="..\..\..\src\libjin\README.md" />
   </ItemGroup>
   <ItemGroup>
@@ -234,7 +232,6 @@
     <ClCompile Include="..\..\..\src\libjin\Audio\SDL\je_sdl_source.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Audio\je_source.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Common\je_exception.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Common\je_utf8.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Filesystem\je_asset_database.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Game\je_gameobject.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Game\je_application.cpp" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index c50f0be..78db345 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -177,9 +177,6 @@
     <ClInclude Include="..\..\..\src\libjin\Common\je_types.h">
       <Filter>source\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Common\je_utf8.h">
-      <Filter>source\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Audio\je_source.h">
       <Filter>source\audio</Filter>
     </ClInclude>
@@ -323,9 +320,6 @@
     <None Include="..\..\..\src\libjin\README.md">
       <Filter>source</Filter>
     </None>
-    <None Include="..\..\..\src\libjin\math\README.md">
-      <Filter>source\common</Filter>
-    </None>
     <None Include="..\..\..\src\libjin\core\README.md">
       <Filter>source\core</Filter>
     </None>
@@ -391,9 +385,6 @@
     <ClCompile Include="..\..\..\src\libjin\Common\je_exception.cpp">
       <Filter>source\common</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Common\je_utf8.cpp">
-      <Filter>source\common</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Audio\je_source.cpp">
       <Filter>source\audio</Filter>
     </ClCompile>