From 70b82d1981c0de3c7b77670ff8abcfeb26815142 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 12 Mar 2019 00:39:26 +0800
Subject: *misc

---
 Build/3rdParty/Luax/Luax.vcxproj         | 23 ++++++++++++++++++++---
 Build/3rdParty/Luax/Luax.vcxproj.filters |  5 +++++
 Build/3rdParty/Luax/Luax.vcxproj.user    |  4 +++-
 Build/3rdParty/lua51/lua51.vcxproj       | 13 ++++++++++---
 4 files changed, 38 insertions(+), 7 deletions(-)

(limited to 'Build/3rdParty')

diff --git a/Build/3rdParty/Luax/Luax.vcxproj b/Build/3rdParty/Luax/Luax.vcxproj
index 9a875b2..92e4686 100644
--- a/Build/3rdParty/Luax/Luax.vcxproj
+++ b/Build/3rdParty/Luax/Luax.vcxproj
@@ -39,13 +39,13 @@
     <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,7 +69,12 @@
     <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|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -84,6 +89,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -108,6 +114,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Source\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -118,6 +125,7 @@
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\lua.hpp" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_class.h" />
+    <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_config.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_function.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_module.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_ref.h" />
@@ -135,6 +143,15 @@
     <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_state.cpp" />
     <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_variable.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\lua51\lua51.vcxproj">
+      <Project>{8b8fca14-fc8a-45b4-bf3c-9340cb586076}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Source\3rdParty\Luax\luax_class.inl" />
+    <None Include="..\..\..\Source\3rdParty\Luax\luax_state.inl" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Build/3rdParty/Luax/Luax.vcxproj.filters b/Build/3rdParty/Luax/Luax.vcxproj.filters
index 13acadc..54bfbc2 100644
--- a/Build/3rdParty/Luax/Luax.vcxproj.filters
+++ b/Build/3rdParty/Luax/Luax.vcxproj.filters
@@ -10,6 +10,7 @@
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_runtime.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_state.h" />
     <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_variable.h" />
+    <ClInclude Include="..\..\..\Source\3rdParty\Luax\luax_config.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax.cpp" />
@@ -21,4 +22,8 @@
     <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_state.cpp" />
     <ClCompile Include="..\..\..\Source\3rdParty\Luax\luax_variable.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Source\3rdParty\Luax\luax_state.inl" />
+    <None Include="..\..\..\Source\3rdParty\Luax\luax_class.inl" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/3rdParty/Luax/Luax.vcxproj.user b/Build/3rdParty/Luax/Luax.vcxproj.user
index be25078..0b0f24d 100644
--- a/Build/3rdParty/Luax/Luax.vcxproj.user
+++ b/Build/3rdParty/Luax/Luax.vcxproj.user
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Build/3rdParty/lua51/lua51.vcxproj b/Build/3rdParty/lua51/lua51.vcxproj
index 460b971..db1825c 100644
--- a/Build/3rdParty/lua51/lua51.vcxproj
+++ b/Build/3rdParty/lua51/lua51.vcxproj
@@ -39,13 +39,13 @@
     <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,7 +69,12 @@
     <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|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\Bin\win64</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -84,6 +89,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -108,6 +114,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-- 
cgit v1.1-26-g67d0