Files cleanup

bjakja · Nov 6, 2020 · d504ae4 · d504ae4
1 parent f926af9
commit d504ae4
Show file tree

Hide file tree

Showing 61 changed files with 36,539 additions and 1,458 deletions.
diff --git a/AutoSending/AutoSending/AutoSending.vcxproj b/AutoSending/AutoSending/AutoSending.vcxproj
@@ -88,7 +88,7 @@
       <SDLCheck>true</SDLCheck>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeaderFile />
-      <AdditionalIncludeDirectories>H:\Kainote\Thirdparty\zlib-1.2.8;H:\Kainote\Thirdparty\wxWidgets\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Thirdparty\zlib-1.2.8;$(SolutionDir)..\Thirdparty\wxWidgets\include;C:\Program Files (x86)\Visual Leak Detector\include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -107,7 +107,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>H:\Kainote\Thirdparty\zlib-1.2.8;H:\Kainote\Thirdparty\wxWidgets\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Thirdparty\zlib-1.2.8;$(SolutionDir)..\Thirdparty\wxWidgets\include;C:\Program Files (x86)\Visual Leak Detector\include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -126,7 +126,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>H:\Kainote\Thirdparty\zlib-1.2.8;H:\Kainote\Thirdparty\wxWidgets\include;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Thirdparty\zlib-1.2.8;$(SolutionDir)..\Thirdparty\wxWidgets\include;C:\Program Files (x86)\Visual Leak Detector\include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -147,7 +147,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;H:\Kainote\Thirdparty\zlib-1.2.8;H:\Kainote\Thirdparty\wxWidgets\include;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\Thirdparty\zlib-1.2.8;$(SolutionDir)..\Thirdparty\wxWidgets\include;C:\Program Files (x86)\Visual Leak Detector\include;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/Thirdparty/Build/LuaJitBuild/LuaJitBuild.vcxproj b/Thirdparty/Build/LuaJitBuild/LuaJitBuild.vcxproj
@@ -225,7 +225,7 @@
     <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <Target Name="MiniLua" BeforeTargets="ClCompile" DependsOnTargets="PrepareForBuild" Inputs="..\..\LuaJIT\src\dynasm\dynasm.lua" Outputs="..\..\LuaJIT\src\host\buildvm_arch.h">
-    <Exec Command="$(MiniLuaCommand) ..\dynasm\dynasm.lua -LN -D WIN -D JIT -D FFI -D P64 -o ..\..\LuaJIT\src\host\buildvm_arch.h vm_x64.dasc" WorkingDirectory="..\..\LuaJIT\src" />
+    <Exec Command="$(MiniLuaCommand) ..\dynasm\dynasm.lua -LN -D WIN -D JIT -D FFI $(MiniLuaPlat) -o ..\..\LuaJIT\src\host\buildvm_arch.h $(MiniLuaVM)" WorkingDirectory="..\..\LuaJIT\src" />
   </Target>
   <ItemGroup>
     <ClCompile Include="..\..\LuaJIT\src\host\buildvm.c" />

diff --git a/Thirdparty/karahelper/COPYING b/Thirdparty/karahelper/COPYING
diff --git a/Thirdparty/karahelper/karahelper.sln b/Thirdparty/karahelper/karahelper.sln
@@ -1,16 +1,14 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1259
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "src\zlib\zlib.vcxproj", "{2FCD4B66-9CF9-4C8F-BC70-37CD20002D49}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "src\libpng\libpng.vcxproj", "{FC8080D1-603C-45EC-BCFA-7172E2F3D989}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "karahelper", "src\karahelper\kmain.vcxproj", "{6B00F64C-ABE4-4BE8-9FE9-57AF1CEFF464}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csri", "src\csri\csri.vcxproj", "{4294BC27-91AC-4642-B5E1-042288478C2A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua51", "src\lua51\lua51.vcxproj", "{1809269E-6E14-47E8-A9D0-147877EBCDBC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -43,24 +41,11 @@ Global
 		{6B00F64C-ABE4-4BE8-9FE9-57AF1CEFF464}.Release|Win32.Build.0 = Release|Win32
 		{6B00F64C-ABE4-4BE8-9FE9-57AF1CEFF464}.Release|x64.ActiveCfg = Release|x64
 		{6B00F64C-ABE4-4BE8-9FE9-57AF1CEFF464}.Release|x64.Build.0 = Release|x64
-		{4294BC27-91AC-4642-B5E1-042288478C2A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4294BC27-91AC-4642-B5E1-042288478C2A}.Debug|Win32.Build.0 = Debug|Win32
-		{4294BC27-91AC-4642-B5E1-042288478C2A}.Debug|x64.ActiveCfg = Debug|x64
-		{4294BC27-91AC-4642-B5E1-042288478C2A}.Debug|x64.Build.0 = Debug|x64
-		{4294BC27-91AC-4642-B5E1-042288478C2A}.Release|Win32.ActiveCfg = Release|Win32
-		{4294BC27-91AC-4642-B5E1-042288478C2A}.Release|Win32.Build.0 = Release|Win32
-		{4294BC27-91AC-4642-B5E1-042288478C2A}.Release|x64.ActiveCfg = Release|x64
-		{4294BC27-91AC-4642-B5E1-042288478C2A}.Release|x64.Build.0 = Release|x64
-		{1809269E-6E14-47E8-A9D0-147877EBCDBC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1809269E-6E14-47E8-A9D0-147877EBCDBC}.Debug|Win32.Build.0 = Debug|Win32
-		{1809269E-6E14-47E8-A9D0-147877EBCDBC}.Debug|x64.ActiveCfg = Debug|x64
-		{1809269E-6E14-47E8-A9D0-147877EBCDBC}.Debug|x64.Build.0 = Debug|x64
-		{1809269E-6E14-47E8-A9D0-147877EBCDBC}.Release|Win32.ActiveCfg = Release|Win32
-		{1809269E-6E14-47E8-A9D0-147877EBCDBC}.Release|Win32.Build.0 = Release|Win32
-		{1809269E-6E14-47E8-A9D0-147877EBCDBC}.Release|x64.ActiveCfg = Release|x64
-		{1809269E-6E14-47E8-A9D0-147877EBCDBC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AA7226A7-54E9-4EC5-9677-7A03D3B8A05F}
+	EndGlobalSection
 EndGlobal
diff --git a/Thirdparty/karahelper/src/common.props b/Thirdparty/karahelper/src/common.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir>$(Configuration)\</OutDir>
+    <IntDir>$(OutDir)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <PreprocessorDefinitions>WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/Thirdparty/karahelper/src/debug.props b/Thirdparty/karahelper/src/debug.props
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>