*misc

3 files changed, 143 insertions, 16 deletions

diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index 21ae963..c682fe5 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -88,7 +88,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>D:\Documents\VisualStudio2017\Projects\GameLab\ThirdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -101,10 +101,10 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>D:\Documents\VisualStudio2017\Projects\GameLab\ThirdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -116,9 +116,10 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
@@ -131,22 +132,31 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\Editor\EditorMain.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\EditorWindows.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\MenuController.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp" />
-    <ClCompile Include="..\..\..\Editor\main.cpp" />
-    <ClCompile Include="..\..\..\Editor\wog.c" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp" />
     <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp" />
     <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" />
   </ItemGroup>
@@ -155,12 +165,25 @@
     <ClInclude Include="..\..\..\Editor\GUI\EditorWindows.h" />
     <ClInclude Include="..\..\..\Editor\GUI\MenuController.h" />
     <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h" />
-    <ClInclude Include="..\..\..\Editor\wog.h" />
     <ClInclude Include="..\..\..\Runtime\Math\AABB.h" />
     <ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Rect.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Vector2.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Vector3.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h" />
     <ClInclude Include="..\..\..\Runtime\Utilities\Assert.h" />
     <ClInclude Include="..\..\..\Runtime\Utilities\Base64.h" />
     <ClInclude Include="..\..\..\Runtime\Utilities\Exception.h" />
@@ -175,6 +198,13 @@
     <ProjectReference Include="..\glad\glad.vcxproj">
       <Project>{385f2d3a-1cef-4aa1-8051-527f6b68dd81}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\lua51\lua51.vcxproj">
+      <Project>{ad09415f-4bf9-4fce-901f-7ab22d429cfc}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc" />
+    <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index e537df8..982bd5b 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -10,6 +10,9 @@
     <Filter Include="Utilities">
       <UniqueIdentifier>{61174975-2b52-426f-b871-d33e1bf956d4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Scripting">
+      <UniqueIdentifier>{f9573ff2-4a53-4953-806e-f0ce0c586910}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Editor\GUI\MenuController.cpp">
@@ -18,8 +21,6 @@
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Editor\main.cpp" />
-    <ClCompile Include="..\..\..\Editor\wog.c" />
     <ClCompile Include="..\..\..\Editor\GUI\EditorWindows.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
@@ -38,6 +39,34 @@
     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Editor\EditorMain.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Editor\GUI\MenuController.h">
@@ -46,7 +75,6 @@
     <ClInclude Include="..\..\..\Editor\GUI\Dock.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Editor\wog.h" />
     <ClInclude Include="..\..\..\Editor\GUI\EditorWindows.h">
       <Filter>GUI</Filter>
     </ClInclude>
@@ -95,5 +123,55 @@
     <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h">
       <Filter>GUI</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc">
+      <Filter>Scripting</Filter>
+    </None>
+    <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc">
+      <Filter>Scripting</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Projects/VisualStudio/lua51/lua51.vcxproj b/Projects/VisualStudio/lua51/lua51.vcxproj
index 99605c6..fb0faec 100644
--- a/Projects/VisualStudio/lua51/lua51.vcxproj
+++ b/Projects/VisualStudio/lua51/lua51.vcxproj
@@ -26,26 +26,26 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</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>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -69,13 +69,26 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)..\..\Build</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)..\..\Build</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)..\..\Build</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\..\Build</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -87,6 +100,8 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -100,6 +115,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -115,6 +132,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>