diff options
author | chai <chaifix@163.com> | 2021-10-25 23:29:21 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2021-10-25 23:29:21 +0800 |
commit | 7ecf913256fb396e3027aac3318d996a716a52ef (patch) | |
tree | 4540835c881a63b665e2a692bf30115fd29e8bb0 /Projects | |
parent | 0816cd70ca1a213b6ed872bcf3c0bf0912473722 (diff) |
+ job system
Diffstat (limited to 'Projects')
-rw-r--r-- | Projects/VisualStudio/AsyncTask/AsyncTask.vcxproj | 131 | ||||
-rw-r--r-- | Projects/VisualStudio/AsyncTask/AsyncTask.vcxproj.filters | 6 | ||||
-rw-r--r-- | Projects/VisualStudio/AsyncTask/AsyncTask.vcxproj.user | 4 | ||||
-rw-r--r-- | Projects/VisualStudio/Editor/Editor.vcxproj | 21 | ||||
-rw-r--r-- | Projects/VisualStudio/Editor/Editor.vcxproj.filters | 75 | ||||
-rw-r--r-- | Projects/VisualStudio/GameLab.sln | 24 | ||||
-rw-r--r-- | Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj | 130 | ||||
-rw-r--r-- | Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj.filters | 2 | ||||
-rw-r--r-- | Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj.user | 4 | ||||
-rw-r--r-- | Projects/VisualStudio/Runtime/Runtime.vcxproj | 5 | ||||
-rw-r--r-- | Projects/VisualStudio/Runtime/Runtime.vcxproj.filters | 18 | ||||
-rw-r--r-- | Projects/VisualStudio/stb/stb.vcxproj | 2 | ||||
-rw-r--r-- | Projects/VisualStudio/stb/stb.vcxproj.filters | 2 |
13 files changed, 394 insertions, 30 deletions
diff --git a/Projects/VisualStudio/AsyncTask/AsyncTask.vcxproj b/Projects/VisualStudio/AsyncTask/AsyncTask.vcxproj new file mode 100644 index 0000000..460a8fe --- /dev/null +++ b/Projects/VisualStudio/AsyncTask/AsyncTask.vcxproj @@ -0,0 +1,131 @@ +<?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>{C22BBF64-192D-430B-9D93-72B6E4DD3F02}</ProjectGuid> + <RootNamespace>AsyncTask</RootNamespace> + <WindowsTargetPlatformVersion>10.0.17763.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>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v141</PlatformToolset> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</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|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + </Link> + </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> + <SubSystem>Console</SubSystem> + <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> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\Plugins\AsyncTask\AsyncTask.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/Projects/VisualStudio/AsyncTask/AsyncTask.vcxproj.filters b/Projects/VisualStudio/AsyncTask/AsyncTask.vcxproj.filters new file mode 100644 index 0000000..7dd7a77 --- /dev/null +++ b/Projects/VisualStudio/AsyncTask/AsyncTask.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> + <ClCompile Include="..\..\..\Plugins\AsyncTask\AsyncTask.cpp" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/Projects/VisualStudio/AsyncTask/AsyncTask.vcxproj.user b/Projects/VisualStudio/AsyncTask/AsyncTask.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Projects/VisualStudio/AsyncTask/AsyncTask.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/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj index 09b27d8..48e86e6 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj +++ b/Projects/VisualStudio/Editor/Editor.vcxproj @@ -169,8 +169,12 @@ <ClCompile Include="..\..\..\Editor\Shaders\BuiltinShaders.cpp" />
<ClCompile Include="..\..\..\Editor\Utils\HelperFuncs.cpp" />
<ClCompile Include="..\..\..\Editor\Win\Win.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Common\DataBuffer.cpp" />
<ClCompile Include="..\..\..\Runtime\Debug\Log.cpp" />
+ <ClCompile Include="..\..\..\Runtime\FileSystem\File.cpp" />
+ <ClCompile Include="..\..\..\Runtime\FileSystem\FileJobs.cpp" />
<ClCompile Include="..\..\..\Runtime\FileSystem\Path.cpp" />
+ <ClCompile Include="..\..\..\Runtime\FileSystem\Unzip.cpp" />
<ClCompile Include="..\..\..\Runtime\Graphics\Device.cpp" />
<ClCompile Include="..\..\..\Runtime\Graphics\FrameBuffer.cpp" />
<ClCompile Include="..\..\..\Runtime\Graphics\GlyphAtlas.cpp" />
@@ -199,12 +203,18 @@ <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" />
<ClCompile Include="..\..\..\Runtime\Profiling\FrameStats.cpp" />
<ClCompile Include="..\..\..\Runtime\Scripting\Debug\Debug.bind.cpp" />
- <ClCompile Include="..\..\..\Runtime\Scripting\FileSystem\FileSystem.bind.cpp" />
<ClCompile Include="..\..\..\Runtime\Scripting\GL\GL.bind.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Scripting\IO\IO.bind.cpp" />
<ClCompile Include="..\..\..\Runtime\Scripting\Path.bind.cpp" />
<ClCompile Include="..\..\..\Runtime\Scripting\Rendering\GPUDataBuffer.bind.cpp" />
<ClCompile Include="..\..\..\Runtime\Scripting\Rendering\Rendering.bind.cpp" />
<ClCompile Include="..\..\..\Runtime\Scripting\Rendering\Shader.bind.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Threading\Job.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Threading\JobSystem.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Threading\Mutex.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Threading\Semaphore.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Threading\Thread.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Threading\WorkThread.cpp" />
<ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp" />
<ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" />
</ItemGroup>
@@ -222,8 +232,12 @@ <ClInclude Include="..\..\..\Editor\Shaders\BuiltinShaders.h" />
<ClInclude Include="..\..\..\Editor\Utils\HelperFuncs.h" />
<ClInclude Include="..\..\..\Editor\Win\Win.h" />
+ <ClInclude Include="..\..\..\Runtime\Common\DataBuffer.h" />
<ClInclude Include="..\..\..\Runtime\Debug\Log.h" />
+ <ClInclude Include="..\..\..\Runtime\FileSystem\File.h" />
+ <ClInclude Include="..\..\..\Runtime\FileSystem\FileJobs.h" />
<ClInclude Include="..\..\..\Runtime\FileSystem\Path.h" />
+ <ClInclude Include="..\..\..\Runtime\FileSystem\Unzip.h" />
<ClInclude Include="..\..\..\Runtime\Graphics\Color.h" />
<ClInclude Include="..\..\..\Runtime\Graphics\Device.h" />
<ClInclude Include="..\..\..\Runtime\Graphics\DeviceDefine.h" />
@@ -266,6 +280,11 @@ <ClInclude Include="..\..\..\Runtime\Math\Vector3.h" />
<ClInclude Include="..\..\..\Runtime\Profiling\FrameStats.h" />
<ClInclude Include="..\..\..\Runtime\Profiling\Profiler.h" />
+ <ClInclude Include="..\..\..\Runtime\Threading\Job.h" />
+ <ClInclude Include="..\..\..\Runtime\Threading\JobSystem.h" />
+ <ClInclude Include="..\..\..\Runtime\Threading\Mutex.h" />
+ <ClInclude Include="..\..\..\Runtime\Threading\Semaphore.h" />
+ <ClInclude Include="..\..\..\Runtime\Threading\Thread.h" />
<ClInclude Include="..\..\..\Runtime\Utilities\Assert.h" />
<ClInclude Include="..\..\..\Runtime\Utilities\Base64.h" />
<ClInclude Include="..\..\..\Runtime\Utilities\Exception.h" />
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters index bd5ff51..30edbd9 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters +++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters @@ -79,9 +79,6 @@ <Filter Include="Runtime\FileSystem">
<UniqueIdentifier>{78c0524a-9039-474a-9a2e-fa243e84d60e}</UniqueIdentifier>
</Filter>
- <Filter Include="Runtime\Scripting\FileSystem">
- <UniqueIdentifier>{350338b7-1176-4edc-9cc7-553a02d69895}</UniqueIdentifier>
- </Filter>
<Filter Include="Editor\GUI\IMGUI">
<UniqueIdentifier>{47032dd6-dca2-478f-b594-d08c0b22e119}</UniqueIdentifier>
</Filter>
@@ -94,6 +91,15 @@ <Filter Include="Runtime\Scripting\Rendering">
<UniqueIdentifier>{6f4bc8ff-dc74-4866-938a-febc29400151}</UniqueIdentifier>
</Filter>
+ <Filter Include="Runtime\Threading">
+ <UniqueIdentifier>{4b88c077-bb33-4123-8860-caf27dbee47a}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\Common">
+ <UniqueIdentifier>{6bbc198e-b012-4f23-9e2d-7573768043c6}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Runtime\Scripting\IO">
+ <UniqueIdentifier>{350338b7-1176-4edc-9cc7-553a02d69895}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">
@@ -225,9 +231,6 @@ <ClCompile Include="..\..\..\Runtime\FileSystem\Path.cpp">
<Filter>Runtime\FileSystem</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\Runtime\Scripting\FileSystem\FileSystem.bind.cpp">
- <Filter>Runtime\Scripting\FileSystem</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\Runtime\Scripting\Path.bind.cpp">
<Filter>Runtime\Scripting</Filter>
</ClCompile>
@@ -288,6 +291,39 @@ <ClCompile Include="..\..\..\Runtime\Scripting\Rendering\GPUDataBuffer.bind.cpp">
<Filter>Runtime\Scripting\Rendering</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\Runtime\FileSystem\Unzip.cpp">
+ <Filter>Runtime\FileSystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\FileSystem\File.cpp">
+ <Filter>Runtime\FileSystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Threading\Mutex.cpp">
+ <Filter>Runtime\Threading</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Threading\Semaphore.cpp">
+ <Filter>Runtime\Threading</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Common\DataBuffer.cpp">
+ <Filter>Runtime\Common</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Threading\Thread.cpp">
+ <Filter>Runtime\Threading</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Threading\Job.cpp">
+ <Filter>Runtime\Threading</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Threading\WorkThread.cpp">
+ <Filter>Runtime\Threading</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\FileSystem\FileJobs.cpp">
+ <Filter>Runtime\FileSystem</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Threading\JobSystem.cpp">
+ <Filter>Runtime\Threading</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Scripting\IO\IO.bind.cpp">
+ <Filter>Runtime\Scripting\IO</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Editor\GUI\Dock.h">
@@ -488,6 +524,33 @@ <ClInclude Include="..\..\..\Runtime\Profiling\Profiler.h">
<Filter>Runtime\Profiling</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\Runtime\FileSystem\Unzip.h">
+ <Filter>Runtime\FileSystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\FileSystem\File.h">
+ <Filter>Runtime\FileSystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Threading\Mutex.h">
+ <Filter>Runtime\Threading</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Threading\Semaphore.h">
+ <Filter>Runtime\Threading</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Threading\Thread.h">
+ <Filter>Runtime\Threading</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Common\DataBuffer.h">
+ <Filter>Runtime\Common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Threading\Job.h">
+ <Filter>Runtime\Threading</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\FileSystem\FileJobs.h">
+ <Filter>Runtime\FileSystem</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Threading\JobSystem.h">
+ <Filter>Runtime\Threading</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.inc">
diff --git a/Projects/VisualStudio/GameLab.sln b/Projects/VisualStudio/GameLab.sln index 27e8383..995ae1b 100644 --- a/Projects/VisualStudio/GameLab.sln +++ b/Projects/VisualStudio/GameLab.sln @@ -23,6 +23,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stb", "stb\stb.vcxproj", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{49F29C84-8A46-4421-9F93-CA96A9292716}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameLabJob", "GameLabJob\GameLabJob.vcxproj", "{DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{537FD9FB-28BD-422B-B144-98D8C229FFF8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AsyncTask", "AsyncTask\AsyncTask.vcxproj", "{C22BBF64-192D-430B-9D93-72B6E4DD3F02}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -103,6 +109,22 @@ Global {49F29C84-8A46-4421-9F93-CA96A9292716}.Release|x64.Build.0 = Release|x64 {49F29C84-8A46-4421-9F93-CA96A9292716}.Release|x86.ActiveCfg = Release|Win32 {49F29C84-8A46-4421-9F93-CA96A9292716}.Release|x86.Build.0 = Release|Win32 + {DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C}.Debug|x64.ActiveCfg = Debug|x64 + {DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C}.Debug|x64.Build.0 = Debug|x64 + {DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C}.Debug|x86.ActiveCfg = Debug|Win32 + {DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C}.Debug|x86.Build.0 = Debug|Win32 + {DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C}.Release|x64.ActiveCfg = Release|x64 + {DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C}.Release|x64.Build.0 = Release|x64 + {DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C}.Release|x86.ActiveCfg = Release|Win32 + {DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C}.Release|x86.Build.0 = Release|Win32 + {C22BBF64-192D-430B-9D93-72B6E4DD3F02}.Debug|x64.ActiveCfg = Debug|x64 + {C22BBF64-192D-430B-9D93-72B6E4DD3F02}.Debug|x64.Build.0 = Debug|x64 + {C22BBF64-192D-430B-9D93-72B6E4DD3F02}.Debug|x86.ActiveCfg = Debug|Win32 + {C22BBF64-192D-430B-9D93-72B6E4DD3F02}.Debug|x86.Build.0 = Debug|Win32 + {C22BBF64-192D-430B-9D93-72B6E4DD3F02}.Release|x64.ActiveCfg = Release|x64 + {C22BBF64-192D-430B-9D93-72B6E4DD3F02}.Release|x64.Build.0 = Release|x64 + {C22BBF64-192D-430B-9D93-72B6E4DD3F02}.Release|x86.ActiveCfg = Release|Win32 + {C22BBF64-192D-430B-9D93-72B6E4DD3F02}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -115,6 +137,8 @@ Global {AD09415F-4BF9-4FCE-901F-7AB22D429CFC} = {0F6EE105-E1FF-4770-8314-06F9F98FB68F} {BFAA8A26-DE6F-4B71-8851-3FF3CF0C8B9F} = {0F6EE105-E1FF-4770-8314-06F9F98FB68F} {49F29C84-8A46-4421-9F93-CA96A9292716} = {0F6EE105-E1FF-4770-8314-06F9F98FB68F} + {DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C} = {0F6EE105-E1FF-4770-8314-06F9F98FB68F} + {C22BBF64-192D-430B-9D93-72B6E4DD3F02} = {537FD9FB-28BD-422B-B144-98D8C229FFF8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C78D376C-9B0B-4EF0-A7D1-0F612F43E793} diff --git a/Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj b/Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj new file mode 100644 index 0000000..4d15398 --- /dev/null +++ b/Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj @@ -0,0 +1,130 @@ +<?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>{DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C}</ProjectGuid> + <RootNamespace>GameLabJob</RootNamespace> + <WindowsTargetPlatformVersion>10.0.17763.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|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <SDLCheck>true</SDLCheck> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + </Link> + </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> + <SubSystem>Console</SubSystem> + <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> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj.filters b/Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj.filters new file mode 100644 index 0000000..9cd8510 --- /dev/null +++ b/Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj.filters @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file diff --git a/Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj.user b/Projects/VisualStudio/GameLabJob/GameLabJob.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/Projects/VisualStudio/GameLabJob/GameLabJob.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/Projects/VisualStudio/Runtime/Runtime.vcxproj b/Projects/VisualStudio/Runtime/Runtime.vcxproj index 36c49d6..27a06a0 100644 --- a/Projects/VisualStudio/Runtime/Runtime.vcxproj +++ b/Projects/VisualStudio/Runtime/Runtime.vcxproj @@ -54,9 +54,6 @@ <ClInclude Include="..\..\..\Runtime\Shaders\ShaderChannel.h" />
<ClInclude Include="..\..\..\Runtime\Shaders\ShaderDefine.h" />
<ClInclude Include="..\..\..\Runtime\Shaders\ShaderUniform.h" />
- <ClInclude Include="..\..\..\Runtime\Threads\Mutex.h" />
- <ClInclude Include="..\..\..\Runtime\Threads\Semaphore.h" />
- <ClInclude Include="..\..\..\Runtime\Threads\Thread.h" />
<ClInclude Include="..\..\..\Runtime\Utilities\Assert.h" />
<ClInclude Include="..\..\..\Runtime\Utilities\Base64.h" />
<ClInclude Include="..\..\..\Runtime\Utilities\Exception.h" />
@@ -95,8 +92,6 @@ <ClCompile Include="..\..\..\Runtime\Physics\Scripting\wrap_Joint.cpp" />
<ClCompile Include="..\..\..\Runtime\Runner.cpp" />
<ClCompile Include="..\..\..\Runtime\Shaders\ShaderDefine.cpp" />
- <ClCompile Include="..\..\..\Runtime\Threads\Mutex.cpp" />
- <ClCompile Include="..\..\..\Runtime\Threads\Semaphore.cpp" />
<ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp" />
<ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" />
</ItemGroup>
diff --git a/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters b/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters index fb980a8..c25be44 100644 --- a/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters +++ b/Projects/VisualStudio/Runtime/Runtime.vcxproj.filters @@ -25,9 +25,6 @@ <Filter Include="Shaders">
<UniqueIdentifier>{bfc9838c-ddde-4d86-8da3-4ccebd976cde}</UniqueIdentifier>
</Filter>
- <Filter Include="Threads">
- <UniqueIdentifier>{f15a5d95-54d1-49e5-bcdf-2759f0afc5c4}</UniqueIdentifier>
- </Filter>
<Filter Include="Utilities">
<UniqueIdentifier>{5bbfbd7d-379a-43e9-b05a-8f97b7f3fa3a}</UniqueIdentifier>
</Filter>
@@ -66,15 +63,6 @@ <ClInclude Include="..\..\..\Runtime\Mesh\MeshUtil.h">
<Filter>Mesh</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\Runtime\Threads\Mutex.h">
- <Filter>Threads</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Runtime\Threads\Thread.h">
- <Filter>Threads</Filter>
- </ClInclude>
- <ClInclude Include="..\..\..\Runtime\Threads\Semaphore.h">
- <Filter>Threads</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\Runtime\Mesh\TextMesh.h">
<Filter>Mesh</Filter>
</ClInclude>
@@ -195,12 +183,6 @@ <ClCompile Include="..\..\..\Runtime\Mesh\Mesh.cpp">
<Filter>Mesh</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\Runtime\Threads\Mutex.cpp">
- <Filter>Threads</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\Runtime\Threads\Semaphore.cpp">
- <Filter>Threads</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\Runtime\Graphics\Device.cpp">
<Filter>Graphics</Filter>
</ClCompile>
diff --git a/Projects/VisualStudio/stb/stb.vcxproj b/Projects/VisualStudio/stb/stb.vcxproj index cca610e..ea639de 100644 --- a/Projects/VisualStudio/stb/stb.vcxproj +++ b/Projects/VisualStudio/stb/stb.vcxproj @@ -124,6 +124,8 @@ </ItemDefinitionGroup> <ItemGroup> <ClInclude Include="..\..\..\ThirdParty\stb\stb_image.h" /> + <ClInclude Include="..\..\..\ThirdParty\stb\stb_image_resize.h" /> + <ClInclude Include="..\..\..\ThirdParty\stb\stb_image_write.h" /> <ClInclude Include="..\..\..\ThirdParty\stb\stb_truetype.h" /> </ItemGroup> <ItemGroup> diff --git a/Projects/VisualStudio/stb/stb.vcxproj.filters b/Projects/VisualStudio/stb/stb.vcxproj.filters index 0926d7a..55215cb 100644 --- a/Projects/VisualStudio/stb/stb.vcxproj.filters +++ b/Projects/VisualStudio/stb/stb.vcxproj.filters @@ -3,6 +3,8 @@ <ItemGroup> <ClInclude Include="..\..\..\ThirdParty\stb\stb_image.h" /> <ClInclude Include="..\..\..\ThirdParty\stb\stb_truetype.h" /> + <ClInclude Include="..\..\..\ThirdParty\stb\stb_image_resize.h" /> + <ClInclude Include="..\..\..\ThirdParty\stb\stb_image_write.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\ThirdParty\stb\stb_vorbis.c" /> |