Patedam/Juliet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made build system more agnostic to the projet it builds

Browse Source
This commit is contained in:
Patedam
2026-07-27 15:16:39 -04:00
parent 0d6b196ce6
commit b196641f18
19 changed files with 1717 additions and 1404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
External/Imgui
Vendored
+1 -1
Submodule External/Imgui updated: 7038887c32...00b2fe6b8b
Game/Game.vcxproj
+44 -56
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
@@ -14,17 +14,8 @@
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup>
<CustomBuild Include="Entity\Entity.h" />
<CustomBuild Include="Entity\EntityManager.cpp" />
<CustomBuild Include="Entity\EntityManager.h" />
<CustomBuild Include="Game.bff" />
<CustomBuild Include="game.cpp" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{b1d040d0-6c94-4f93-bc2a-7f5284b7d434}</ProjectGuid> <ProjectGuid>{b568a67e-05a1-9907-ff4b-a129119528bd}</ProjectGuid>
<Keyword>MakeFileProj</Keyword> <Keyword>MakeFileProj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -32,72 +23,69 @@
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </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)'=='Profile|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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Debug $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Debug $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Debug $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Debug\Game.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Debug\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Debug\Game\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Debug\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Profile $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Profile $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Profile $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Profile\Game.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Profile\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Profile\Game\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Profile\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Release $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Release $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Release $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Release\Game.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Release\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Release\Game\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Release\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemGroup>
<BuildLog> <ClCompile Include="Entity\EntityManager.cpp" />
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path> <ClCompile Include="game.cpp" />
</BuildLog> <ClInclude Include="Entity\Entity.h" />
</ItemDefinitionGroup> <ClInclude Include="Entity\EntityManager.h" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> </ItemGroup>
<BuildLog>
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path>
</BuildLog>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<BuildLog>
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path>
</BuildLog>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
<Import Condition="'$(ConfigurationType)' == 'Makefile' and '$(AndroidAPILevel)' != '' and Exists('$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets')" Project="$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets" />
</Project> </Project>
Game/Game.vcxproj.filters
+12 -16
View File
@@ -1,23 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<CustomBuild Include="Entity\Entity.h">
<Filter>Entity</Filter>
</CustomBuild>
<CustomBuild Include="Entity\EntityManager.cpp">
<Filter>Entity</Filter>
</CustomBuild>
<CustomBuild Include="Entity\EntityManager.h">
<Filter>Entity</Filter>
</CustomBuild>
<CustomBuild Include="Game.bff">
</CustomBuild>
<CustomBuild Include="game.cpp">
</CustomBuild>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Entity"> <Filter Include="Entity">
<UniqueIdentifier>{6051ee0a-6c94-4f93-bc2a-7f5284b7d434}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClCompile Include="Entity\EntityManager.cpp">
<Filter>Entity</Filter>
</ClCompile>
<ClCompile Include="game.cpp" />
<ClInclude Include="Entity\Entity.h">
<Filter>Entity</Filter>
</ClInclude>
<ClInclude Include="Entity\EntityManager.h">
<Filter>Entity</Filter>
</ClInclude>
</ItemGroup>
</Project> </Project>
Juliet.sln
+30 -21
View File
@@ -1,14 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio Version 17
VisualStudioVersion = 14.0.22823.1 VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\ImGui.vcxproj", "{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JulietApp", "JulietApp\JulietApp.vcxproj", "{1720427b-c8ba-3195-f931-e97f6d6125c1}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "Game\Game.vcxproj", "{B1D040D0-6C94-4F93-BC2A-7F5284B7D434}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JulietApp", "JulietApp\JulietApp.vcxproj", "{1DEE51CA-6C94-4F93-BC2A-7F5284B7D434}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "Game\Game.vcxproj", "{b568a67e-05a1-9907-ff4b-a129119528bd}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\imgui\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,21 +17,30 @@ Global
Release|x64 = Release|x64 Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.ActiveCfg = Debug|x64 {1720427b-c8ba-3195-f931-e97f6d6125c1}.Debug|x64.ActiveCfg = Debug|x64
{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.ActiveCfg = Profile|x64 {1720427b-c8ba-3195-f931-e97f6d6125c1}.Debug|x64.Build.0 = Debug|x64
{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.ActiveCfg = Release|x64 {1720427b-c8ba-3195-f931-e97f6d6125c1}.Profile|x64.ActiveCfg = Profile|x64
{B1D040D0-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.ActiveCfg = Debug|x64 {1720427b-c8ba-3195-f931-e97f6d6125c1}.Profile|x64.Build.0 = Profile|x64
{B1D040D0-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.ActiveCfg = Profile|x64 {1720427b-c8ba-3195-f931-e97f6d6125c1}.Release|x64.ActiveCfg = Release|x64
{B1D040D0-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.ActiveCfg = Release|x64 {1720427b-c8ba-3195-f931-e97f6d6125c1}.Release|x64.Build.0 = Release|x64
{1DEE51CA-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.ActiveCfg = Debug|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Debug|x64.ActiveCfg = Debug|x64
{1DEE51CA-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.Build.0 = Debug|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Debug|x64.Build.0 = Debug|x64
{1DEE51CA-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.ActiveCfg = Profile|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Profile|x64.ActiveCfg = Profile|x64
{1DEE51CA-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.Build.0 = Profile|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Profile|x64.Build.0 = Profile|x64
{1DEE51CA-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.ActiveCfg = Release|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Release|x64.ActiveCfg = Release|x64
{1DEE51CA-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.Build.0 = Release|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Release|x64.Build.0 = Release|x64
{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.ActiveCfg = Debug|x64 {b568a67e-05a1-9907-ff4b-a129119528bd}.Debug|x64.ActiveCfg = Debug|x64
{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.ActiveCfg = Profile|x64 {b568a67e-05a1-9907-ff4b-a129119528bd}.Debug|x64.Build.0 = Debug|x64
{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.ActiveCfg = Release|x64 {b568a67e-05a1-9907-ff4b-a129119528bd}.Profile|x64.ActiveCfg = Profile|x64
{b568a67e-05a1-9907-ff4b-a129119528bd}.Profile|x64.Build.0 = Profile|x64
{b568a67e-05a1-9907-ff4b-a129119528bd}.Release|x64.ActiveCfg = Release|x64
{b568a67e-05a1-9907-ff4b-a129119528bd}.Release|x64.Build.0 = Release|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Debug|x64.ActiveCfg = Debug|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Debug|x64.Build.0 = Debug|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Profile|x64.ActiveCfg = Profile|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Profile|x64.Build.0 = Profile|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Release|x64.ActiveCfg = Release|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
Juliet/Juliet.vcxproj
+220 -232
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
@@ -14,193 +14,8 @@
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup>
<CustomBuild Include="include\Core\Application\ApplicationManager.h" />
<CustomBuild Include="include\Core\Application\IApplication.h" />
<CustomBuild Include="include\Core\Common\CoreTypes.h" />
<CustomBuild Include="include\Core\Common\CoreUtils.h" />
<CustomBuild Include="include\Core\Common\CRC32.h" />
<CustomBuild Include="include\Core\Common\EnumUtils.h" />
<CustomBuild Include="include\Core\Common\NonCopyable.h" />
<CustomBuild Include="include\Core\Common\NonMovable.h" />
<CustomBuild Include="include\Core\Common\NonNullPtr.h" />
<CustomBuild Include="include\Core\Common\Singleton.h" />
<CustomBuild Include="include\Core\Common\String.h" />
<CustomBuild Include="include\Core\Container\Vector.h" />
<CustomBuild Include="include\Core\HAL\Display\Display.h" />
<CustomBuild Include="include\Core\HAL\DynLib\DynamicLibrary.h" />
<CustomBuild Include="include\Core\HAL\Event\SystemEvent.h" />
<CustomBuild Include="include\Core\HAL\Filesystem\Filesystem.h" />
<CustomBuild Include="include\Core\HAL\IO\IOStream.h" />
<CustomBuild Include="include\Core\HAL\Keyboard\Keyboard.h" />
<CustomBuild Include="include\Core\HAL\Keyboard\KeyCode.h" />
<CustomBuild Include="include\Core\HAL\Keyboard\ScanCode.h" />
<CustomBuild Include="include\Core\HAL\Mouse\Mouse.h" />
<CustomBuild Include="include\Core\HAL\OS\OS.h" />
<CustomBuild Include="include\Core\HotReload\HotReload.h" />
<CustomBuild Include="include\Core\ImGui\ImGuiService.h" />
<CustomBuild Include="include\Core\ImGui\ImGuiTests.h" />
<CustomBuild Include="include\Core\JulietInit.h" />
<CustomBuild Include="include\Core\Logging\LogManager.h" />
<CustomBuild Include="include\Core\Logging\LogTypes.h" />
<CustomBuild Include="include\Core\Main.h" />
<CustomBuild Include="include\Core\Math\MathUtils.h" />
<CustomBuild Include="include\Core\Math\Matrix.h" />
<CustomBuild Include="include\Core\Math\Shape.h" />
<CustomBuild Include="include\Core\Math\Vector.h" />
<CustomBuild Include="include\Core\Memory\Allocator.h" />
<CustomBuild Include="include\Core\Memory\MemoryArena.h" />
<CustomBuild Include="include\Core\Memory\MemoryArenaDebug.h" />
<CustomBuild Include="include\Core\Memory\ScratchArena.h" />
<CustomBuild Include="include\Core\Memory\Utils.h" />
<CustomBuild Include="include\Core\Networking\IPAddress.h" />
<CustomBuild Include="include\Core\Networking\NetworkPacket.h" />
<CustomBuild Include="include\Core\Networking\Socket.h" />
<CustomBuild Include="include\Core\Networking\SocketHandle.h" />
<CustomBuild Include="include\Core\Networking\TcpListener.h" />
<CustomBuild Include="include\Core\Networking\TcpSocket.h" />
<CustomBuild Include="include\Core\Thread\Mutex.h" />
<CustomBuild Include="include\Core\Thread\Thread.h" />
<CustomBuild Include="include\Engine\Class.h" />
<CustomBuild Include="include\Engine\Debug\MemoryDebugger.h" />
<CustomBuild Include="include\Engine\Engine.h" />
<CustomBuild Include="include\Graphics\Camera.h" />
<CustomBuild Include="include\Graphics\Colors.h" />
<CustomBuild Include="include\Graphics\DebugDisplay.h" />
<CustomBuild Include="include\Graphics\Graphics.h" />
<CustomBuild Include="include\Graphics\GraphicsBuffer.h" />
<CustomBuild Include="include\Graphics\GraphicsConfig.h" />
<CustomBuild Include="include\Graphics\GraphicsPipeline.h" />
<CustomBuild Include="include\Graphics\ImGuiRenderer.h" />
<CustomBuild Include="include\Graphics\Lighting.h" />
<CustomBuild Include="include\Graphics\Mesh.h" />
<CustomBuild Include="include\Graphics\MeshRenderer.h" />
<CustomBuild Include="include\Graphics\PushConstants.h" />
<CustomBuild Include="include\Graphics\RenderPass.h" />
<CustomBuild Include="include\Graphics\Shader.h" />
<CustomBuild Include="include\Graphics\SkyboxRenderer.h" />
<CustomBuild Include="include\Graphics\Texture.h" />
<CustomBuild Include="include\Graphics\VertexData.h" />
<CustomBuild Include="include\Juliet.h" />
<CustomBuild Include="Juliet.bff" />
<CustomBuild Include="src\Core\Application\ApplicationManager.cpp" />
<CustomBuild Include="src\Core\Common\CoreUtils.cpp" />
<CustomBuild Include="src\Core\Common\String.cpp" />
<CustomBuild Include="src\Core\Container\Vector.cpp" />
<CustomBuild Include="src\Core\HAL\Display\Display.cpp" />
<CustomBuild Include="src\Core\HAL\Display\Display_Private.h" />
<CustomBuild Include="src\Core\HAL\Display\DisplayDevice.h" />
<CustomBuild Include="src\Core\HAL\Display\Win32\Win32DisplayDevice.cpp" />
<CustomBuild Include="src\Core\HAL\Display\Win32\Win32DisplayEvent.cpp" />
<CustomBuild Include="src\Core\HAL\Display\Win32\Win32DisplayEvent.h" />
<CustomBuild Include="src\Core\HAL\Display\Win32\Win32Window.cpp" />
<CustomBuild Include="src\Core\HAL\Display\Win32\Win32Window.h" />
<CustomBuild Include="src\Core\HAL\Display\Window.h" />
<CustomBuild Include="src\Core\HAL\DynLib\Win32\DynamicLibrary.cpp" />
<CustomBuild Include="src\Core\HAL\Event\Keyboard.cpp" />
<CustomBuild Include="src\Core\HAL\Event\Keyboard_Private.h" />
<CustomBuild Include="src\Core\HAL\Event\KeyboardMapping.cpp" />
<CustomBuild Include="src\Core\HAL\Event\KeyboardMapping.h" />
<CustomBuild Include="src\Core\HAL\Event\Mouse.cpp" />
<CustomBuild Include="src\Core\HAL\Event\Mouse_Private.h" />
<CustomBuild Include="src\Core\HAL\Event\SystemEvent.cpp" />
<CustomBuild Include="src\Core\HAL\Event\Win32ScanCode.h" />
<CustomBuild Include="src\Core\HAL\Event\WindowEvent.cpp" />
<CustomBuild Include="src\Core\HAL\Event\WindowEvent.h" />
<CustomBuild Include="src\Core\HAL\Filesystem\Filesystem.cpp" />
<CustomBuild Include="src\Core\HAL\Filesystem\Filesystem_Platform.h" />
<CustomBuild Include="src\Core\HAL\Filesystem\Filesystem_Private.h" />
<CustomBuild Include="src\Core\HAL\Filesystem\Win32\Win32Filesystem.cpp" />
<CustomBuild Include="src\Core\HAL\IO\IOStream.cpp" />
<CustomBuild Include="src\Core\HAL\IO\IOStream_Private.h" />
<CustomBuild Include="src\Core\HAL\IO\Win32\Win32IOStream.cpp" />
<CustomBuild Include="src\Core\HAL\OS\OS.cpp" />
<CustomBuild Include="src\Core\HAL\OS\OS_Private.h" />
<CustomBuild Include="src\Core\HAL\OS\Win32\Win32OS.cpp" />
<CustomBuild Include="src\Core\HAL\Win32.h" />
<CustomBuild Include="src\Core\HotReload\HotReload.cpp" />
<CustomBuild Include="src\Core\HotReload\Win32\Win32HotReload.cpp" />
<CustomBuild Include="src\Core\ImGui\ImGuiService.cpp" />
<CustomBuild Include="src\Core\ImGui\ImGuiTests.cpp" />
<CustomBuild Include="src\Core\Juliet.cpp" />
<CustomBuild Include="src\Core\Logging\LogManager.cpp" />
<CustomBuild Include="src\Core\Math\Math_Private.h" />
<CustomBuild Include="src\Core\Math\MathRound.cpp" />
<CustomBuild Include="src\Core\Memory\Allocator.cpp" />
<CustomBuild Include="src\Core\Memory\MemoryArena.cpp" />
<CustomBuild Include="src\Core\Memory\MemoryArenaDebug.cpp" />
<CustomBuild Include="src\Core\Memory\MemoryArenaTests.cpp" />
<CustomBuild Include="src\Core\Memory\ScratchArena.cpp" />
<CustomBuild Include="src\Core\Networking\NetworkPacket.cpp" />
<CustomBuild Include="src\Core\Networking\Socket.cpp" />
<CustomBuild Include="src\Core\Networking\SocketPlatformImpl.h" />
<CustomBuild Include="src\Core\Networking\TcpListener.cpp" />
<CustomBuild Include="src\Core\Networking\TcpSocket.cpp" />
<CustomBuild Include="src\Core\Networking\Win32\Win32SocketPlatformImpl.cpp" />
<CustomBuild Include="src\Engine\Debug\MemoryDebugger.cpp" />
<CustomBuild Include="src\Engine\Engine.cpp" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3d12.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3d12compatibility.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3d12sdklayers.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3d12shader.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\D3D12TokenizedProgramFormat.hpp" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3d12video.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dcommon.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_barriers.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_check_feature_support.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_core.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_default.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_pipeline_state_stream.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_property_format_table.cpp" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_property_format_table.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_render_pass.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_resource_helpers.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_root_signature.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_state_object.h" />
<CustomBuild Include="src\Graphics\D3D12\AgilitySDK\dxgiformat.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Buffer.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Buffer.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12CommandList.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12CommandList.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Common.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Common.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12DescriptorHeap.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12DescriptorHeap.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12GraphicsDevice.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12GraphicsDevice.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12GraphicsPipeline.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12GraphicsPipeline.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Includes.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12InternalTests.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12InternalTests.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12RenderPass.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12RenderPass.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Shader.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Shader.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12SwapChain.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12SwapChain.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Synchronization.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Synchronization.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Texture.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Texture.h" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Utils.cpp" />
<CustomBuild Include="src\Graphics\D3D12\D3D12Utils.h" />
<CustomBuild Include="src\Graphics\DebugDisplayRenderer.cpp" />
<CustomBuild Include="src\Graphics\Graphics.cpp" />
<CustomBuild Include="src\Graphics\GraphicsDevice.h" />
<CustomBuild Include="src\Graphics\ImGuiRenderer.cpp" />
<CustomBuild Include="src\Graphics\Mesh.cpp" />
<CustomBuild Include="src\Graphics\MeshRenderer.cpp" />
<CustomBuild Include="src\Graphics\SkyboxRenderer.cpp" />
<CustomBuild Include="src\UnitTest\Container\VectorUnitTest.cpp" />
<CustomBuild Include="src\UnitTest\RunUnitTests.cpp" />
<CustomBuild Include="src\UnitTest\VectorTestHelper.h" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{ab9c7e88-6c94-4f93-bc2a-7f5284b7d434}</ProjectGuid> <ProjectGuid>{a93aa30f-8f29-02fe-57e2-cd3626948b68}</ProjectGuid>
<Keyword>MakeFileProj</Keyword> <Keyword>MakeFileProj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -208,72 +23,245 @@
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </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)'=='Profile|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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Debug $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Debug $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Debug $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Debug\Juliet.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Debug\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Debug\Juliet\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Debug\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Profile $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Profile $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Profile $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Profile\Juliet.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Profile\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Profile\Juliet\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Profile\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Release $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Release $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Release $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Release\Juliet.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Release\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Release\Juliet\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Release\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemGroup>
<BuildLog> <ClCompile Include="src\Core\Application\ApplicationManager.cpp" />
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path> <ClCompile Include="src\Core\Common\CoreUtils.cpp" />
</BuildLog> <ClCompile Include="src\Core\Common\String.cpp" />
</ItemDefinitionGroup> <ClCompile Include="src\Core\Container\Vector.cpp" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> <ClCompile Include="src\Core\HAL\Display\Display.cpp" />
<BuildLog> <ClCompile Include="src\Core\HAL\Display\Win32\Win32DisplayDevice.cpp" />
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path> <ClCompile Include="src\Core\HAL\Display\Win32\Win32DisplayEvent.cpp" />
</BuildLog> <ClCompile Include="src\Core\HAL\Display\Win32\Win32Window.cpp" />
</ItemDefinitionGroup> <ClCompile Include="src\Core\HAL\DynLib\Win32\DynamicLibrary.cpp" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile Include="src\Core\HAL\Event\Keyboard.cpp" />
<BuildLog> <ClCompile Include="src\Core\HAL\Event\KeyboardMapping.cpp" />
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path> <ClCompile Include="src\Core\HAL\Event\Mouse.cpp" />
</BuildLog> <ClCompile Include="src\Core\HAL\Event\SystemEvent.cpp" />
</ItemDefinitionGroup> <ClCompile Include="src\Core\HAL\Event\WindowEvent.cpp" />
<ClCompile Include="src\Core\HAL\Filesystem\Filesystem.cpp" />
<ClCompile Include="src\Core\HAL\Filesystem\Win32\Win32Filesystem.cpp" />
<ClCompile Include="src\Core\HAL\IO\IOStream.cpp" />
<ClCompile Include="src\Core\HAL\IO\Win32\Win32IOStream.cpp" />
<ClCompile Include="src\Core\HAL\OS\OS.cpp" />
<ClCompile Include="src\Core\HAL\OS\Win32\Win32OS.cpp" />
<ClCompile Include="src\Core\HotReload\HotReload.cpp" />
<ClCompile Include="src\Core\HotReload\Win32\Win32HotReload.cpp" />
<ClCompile Include="src\Core\ImGui\ImGuiService.cpp" />
<ClCompile Include="src\Core\ImGui\ImGuiTests.cpp" />
<ClCompile Include="src\Core\Juliet.cpp" />
<ClCompile Include="src\Core\Logging\LogManager.cpp" />
<ClCompile Include="src\Core\Math\MathRound.cpp" />
<ClCompile Include="src\Core\Memory\Allocator.cpp" />
<ClCompile Include="src\Core\Memory\MemoryArena.cpp" />
<ClCompile Include="src\Core\Memory\MemoryArenaDebug.cpp" />
<ClCompile Include="src\Core\Memory\MemoryArenaTests.cpp" />
<ClCompile Include="src\Core\Memory\ScratchArena.cpp" />
<ClCompile Include="src\Core\Networking\NetworkPacket.cpp" />
<ClCompile Include="src\Core\Networking\Socket.cpp" />
<ClCompile Include="src\Core\Networking\TcpListener.cpp" />
<ClCompile Include="src\Core\Networking\TcpSocket.cpp" />
<ClCompile Include="src\Core\Networking\Win32\Win32SocketPlatformImpl.cpp" />
<ClCompile Include="src\Engine\Debug\MemoryDebugger.cpp" />
<ClCompile Include="src\Engine\Engine.cpp" />
<ClCompile Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_property_format_table.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12Buffer.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12CommandList.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12Common.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12DescriptorHeap.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12GraphicsDevice.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12GraphicsPipeline.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12InternalTests.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12RenderPass.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12Shader.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12SwapChain.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12Synchronization.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12Texture.cpp" />
<ClCompile Include="src\Graphics\D3D12\D3D12Utils.cpp" />
<ClCompile Include="src\Graphics\DebugDisplayRenderer.cpp" />
<ClCompile Include="src\Graphics\Graphics.cpp" />
<ClCompile Include="src\Graphics\ImGuiRenderer.cpp" />
<ClCompile Include="src\Graphics\Mesh.cpp" />
<ClCompile Include="src\Graphics\MeshRenderer.cpp" />
<ClCompile Include="src\Graphics\SkyboxRenderer.cpp" />
<ClCompile Include="src\UnitTest\Container\VectorUnitTest.cpp" />
<ClCompile Include="src\UnitTest\RunUnitTests.cpp" />
<ClInclude Include="include\Core\Application\ApplicationManager.h" />
<ClInclude Include="include\Core\Application\IApplication.h" />
<ClInclude Include="include\Core\Common\CoreTypes.h" />
<ClInclude Include="include\Core\Common\CoreUtils.h" />
<ClInclude Include="include\Core\Common\CRC32.h" />
<ClInclude Include="include\Core\Common\EnumUtils.h" />
<ClInclude Include="include\Core\Common\NonCopyable.h" />
<ClInclude Include="include\Core\Common\NonMovable.h" />
<ClInclude Include="include\Core\Common\NonNullPtr.h" />
<ClInclude Include="include\Core\Common\Singleton.h" />
<ClInclude Include="include\Core\Common\String.h" />
<ClInclude Include="include\Core\Container\Vector.h" />
<ClInclude Include="include\Core\HAL\Display\Display.h" />
<ClInclude Include="include\Core\HAL\DynLib\DynamicLibrary.h" />
<ClInclude Include="include\Core\HAL\Event\SystemEvent.h" />
<ClInclude Include="include\Core\HAL\Filesystem\Filesystem.h" />
<ClInclude Include="include\Core\HAL\IO\IOStream.h" />
<ClInclude Include="include\Core\HAL\Keyboard\Keyboard.h" />
<ClInclude Include="include\Core\HAL\Keyboard\KeyCode.h" />
<ClInclude Include="include\Core\HAL\Keyboard\ScanCode.h" />
<ClInclude Include="include\Core\HAL\Mouse\Mouse.h" />
<ClInclude Include="include\Core\HAL\OS\OS.h" />
<ClInclude Include="include\Core\HotReload\HotReload.h" />
<ClInclude Include="include\Core\ImGui\ImGuiService.h" />
<ClInclude Include="include\Core\ImGui\ImGuiTests.h" />
<ClInclude Include="include\Core\JulietInit.h" />
<ClInclude Include="include\Core\Logging\LogManager.h" />
<ClInclude Include="include\Core\Logging\LogTypes.h" />
<ClInclude Include="include\Core\Main.h" />
<ClInclude Include="include\Core\Math\MathUtils.h" />
<ClInclude Include="include\Core\Math\Matrix.h" />
<ClInclude Include="include\Core\Math\Shape.h" />
<ClInclude Include="include\Core\Math\Vector.h" />
<ClInclude Include="include\Core\Memory\Allocator.h" />
<ClInclude Include="include\Core\Memory\MemoryArena.h" />
<ClInclude Include="include\Core\Memory\MemoryArenaDebug.h" />
<ClInclude Include="include\Core\Memory\ScratchArena.h" />
<ClInclude Include="include\Core\Memory\Utils.h" />
<ClInclude Include="include\Core\Networking\IPAddress.h" />
<ClInclude Include="include\Core\Networking\NetworkPacket.h" />
<ClInclude Include="include\Core\Networking\Socket.h" />
<ClInclude Include="include\Core\Networking\SocketHandle.h" />
<ClInclude Include="include\Core\Networking\TcpListener.h" />
<ClInclude Include="include\Core\Networking\TcpSocket.h" />
<ClInclude Include="include\Core\Thread\Mutex.h" />
<ClInclude Include="include\Core\Thread\Thread.h" />
<ClInclude Include="include\Engine\Class.h" />
<ClInclude Include="include\Engine\Debug\MemoryDebugger.h" />
<ClInclude Include="include\Engine\Engine.h" />
<ClInclude Include="include\Graphics\Camera.h" />
<ClInclude Include="include\Graphics\Colors.h" />
<ClInclude Include="include\Graphics\DebugDisplay.h" />
<ClInclude Include="include\Graphics\Graphics.h" />
<ClInclude Include="include\Graphics\GraphicsBuffer.h" />
<ClInclude Include="include\Graphics\GraphicsConfig.h" />
<ClInclude Include="include\Graphics\GraphicsPipeline.h" />
<ClInclude Include="include\Graphics\ImGuiRenderer.h" />
<ClInclude Include="include\Graphics\Lighting.h" />
<ClInclude Include="include\Graphics\Mesh.h" />
<ClInclude Include="include\Graphics\MeshRenderer.h" />
<ClInclude Include="include\Graphics\PushConstants.h" />
<ClInclude Include="include\Graphics\RenderPass.h" />
<ClInclude Include="include\Graphics\Shader.h" />
<ClInclude Include="include\Graphics\SkyboxRenderer.h" />
<ClInclude Include="include\Graphics\Texture.h" />
<ClInclude Include="include\Graphics\VertexData.h" />
<ClInclude Include="include\Juliet.h" />
<ClInclude Include="src\Core\HAL\Display\DisplayDevice.h" />
<ClInclude Include="src\Core\HAL\Display\Display_Private.h" />
<ClInclude Include="src\Core\HAL\Display\Win32\Win32DisplayEvent.h" />
<ClInclude Include="src\Core\HAL\Display\Win32\Win32Window.h" />
<ClInclude Include="src\Core\HAL\Display\Window.h" />
<ClInclude Include="src\Core\HAL\Event\KeyboardMapping.h" />
<ClInclude Include="src\Core\HAL\Event\Keyboard_Private.h" />
<ClInclude Include="src\Core\HAL\Event\Mouse_Private.h" />
<ClInclude Include="src\Core\HAL\Event\Win32ScanCode.h" />
<ClInclude Include="src\Core\HAL\Event\WindowEvent.h" />
<ClInclude Include="src\Core\HAL\Filesystem\Filesystem_Platform.h" />
<ClInclude Include="src\Core\HAL\Filesystem\Filesystem_Private.h" />
<ClInclude Include="src\Core\HAL\IO\IOStream_Private.h" />
<ClInclude Include="src\Core\HAL\OS\OS_Private.h" />
<ClInclude Include="src\Core\HAL\Win32.h" />
<ClInclude Include="src\Core\Math\Math_Private.h" />
<ClInclude Include="src\Core\Networking\SocketPlatformImpl.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3d12.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3d12compatibility.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3d12sdklayers.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3d12shader.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3d12video.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dcommon.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_barriers.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_check_feature_support.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_core.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_default.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_pipeline_state_stream.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_property_format_table.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_render_pass.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_resource_helpers.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_root_signature.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_state_object.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\dxgiformat.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12Buffer.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12CommandList.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12Common.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12DescriptorHeap.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12GraphicsDevice.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12GraphicsPipeline.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12Includes.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12InternalTests.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12RenderPass.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12Shader.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12SwapChain.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12Synchronization.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12Texture.h" />
<ClInclude Include="src\Graphics\D3D12\D3D12Utils.h" />
<ClInclude Include="src\Graphics\GraphicsDevice.h" />
<ClInclude Include="src\UnitTest\VectorTestHelper.h" />
<ClInclude Include="src\Graphics\D3D12\AgilitySDK\D3D12TokenizedProgramFormat.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
<Import Condition="'$(ConfigurationType)' == 'Makefile' and '$(AndroidAPILevel)' != '' and Exists('$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets')" Project="$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets" />
</Project> </Project>
Juliet/Juliet.vcxproj.filters
+605 -776
View File
File diff suppressed because it is too large Load Diff
Juliet/src/Engine/Engine.cpp
+2 -1
View File
@@ -1,9 +1,10 @@
#include <Engine/Engine.h>
#include <Core/Common/CoreUtils.h> #include <Core/Common/CoreUtils.h>
#include <Core/HAL/Filesystem/Filesystem_Private.h> #include <Core/HAL/Filesystem/Filesystem_Private.h>
#include <Core/JulietInit.h> #include <Core/JulietInit.h>
#include <Core/Logging/LogManager.h> #include <Core/Logging/LogManager.h>
#include <Core/Memory/MemoryArena.h> #include <Core/Memory/MemoryArena.h>
#include <Engine/Engine.h>
#include <Graphics/DebugDisplay.h> #include <Graphics/DebugDisplay.h>
#include <Graphics/Graphics.h> #include <Graphics/Graphics.h>
#include <Graphics/MeshRenderer.h> #include <Graphics/MeshRenderer.h>
JulietApp/JulietApp.vcxproj
+42 -54
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
@@ -14,15 +14,8 @@
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup>
<CustomBuild Include="JulietApp.bff" />
<CustomBuild Include="main.cpp" />
<CustomBuild Include="main.h" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{1dee51ca-6c94-4f93-bc2a-7f5284b7d434}</ProjectGuid> <ProjectGuid>{1720427b-c8ba-3195-f931-e97f6d6125c1}</ProjectGuid>
<Keyword>MakeFileProj</Keyword> <Keyword>MakeFileProj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -30,72 +23,67 @@
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </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)'=='Profile|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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Debug $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Debug $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Debug $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Debug\JulietApp.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Debug\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Debug\JulietApp\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Debug\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Profile $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Profile $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Profile $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Profile\JulietApp.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Profile\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Profile\JulietApp\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Profile\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Release $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Release $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Release $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Release\JulietApp.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Release\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Release\JulietApp\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Release\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemGroup>
<BuildLog> <ClCompile Include="main.cpp" />
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path> <ClInclude Include="main.h" />
</BuildLog> </ItemGroup>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
<BuildLog>
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path>
</BuildLog>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<BuildLog>
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path>
</BuildLog>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
<Import Condition="'$(ConfigurationType)' == 'Makefile' and '$(AndroidAPILevel)' != '' and Exists('$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets')" Project="$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets" />
</Project> </Project>
JulietApp/JulietApp.vcxproj.filters
+4 -6
View File
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="JulietApp.bff"> </ItemGroup>
</CustomBuild> <ItemGroup>
<CustomBuild Include="main.cpp"> <ClCompile Include="main.cpp" />
</CustomBuild> <ClInclude Include="main.h" />
<CustomBuild Include="main.h">
</CustomBuild>
</ItemGroup> </ItemGroup>
</Project> </Project>
JulietShaderCompiler.sln
+23 -17
View File
@@ -1,12 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio Version 17
VisualStudioVersion = 14.0.22823.1 VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\ImGui.vcxproj", "{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JulietShaderCompiler", "JulietShaderCompiler\JulietShaderCompiler.vcxproj", "{c7df05fe-d5d5-db2a-af36-e7d71d325fda}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JulietShaderCompiler", "JulietShaderCompiler\JulietShaderCompiler.vcxproj", "{534B94ED-6C94-4F93-BC2A-7F5284B7D434}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\imgui\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,18 +15,24 @@ Global
Release|x64 = Release|x64 Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.ActiveCfg = Debug|x64 {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Debug|x64.ActiveCfg = Debug|x64
{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.ActiveCfg = Profile|x64 {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Debug|x64.Build.0 = Debug|x64
{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.ActiveCfg = Release|x64 {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Profile|x64.ActiveCfg = Profile|x64
{534B94ED-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.ActiveCfg = Debug|x64 {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Profile|x64.Build.0 = Profile|x64
{534B94ED-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.Build.0 = Debug|x64 {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Release|x64.ActiveCfg = Release|x64
{534B94ED-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.ActiveCfg = Profile|x64 {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Release|x64.Build.0 = Release|x64
{534B94ED-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.Build.0 = Profile|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Debug|x64.ActiveCfg = Debug|x64
{534B94ED-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.ActiveCfg = Release|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Debug|x64.Build.0 = Debug|x64
{534B94ED-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.Build.0 = Release|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Profile|x64.ActiveCfg = Profile|x64
{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.ActiveCfg = Debug|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Profile|x64.Build.0 = Profile|x64
{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.ActiveCfg = Profile|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Release|x64.ActiveCfg = Release|x64
{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.ActiveCfg = Release|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Release|x64.Build.0 = Release|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Debug|x64.ActiveCfg = Debug|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Debug|x64.Build.0 = Debug|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Profile|x64.ActiveCfg = Profile|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Profile|x64.Build.0 = Profile|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Release|x64.ActiveCfg = Release|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
JulietShaderCompiler/JulietShaderCompiler.vcxproj
+47 -59
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
@@ -14,17 +14,8 @@
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup>
<CustomBuild Include="DXShaderCompiler\DXCompiler.h" />
<CustomBuild Include="JulietShaderCompiler.bff" />
<CustomBuild Include="main.cpp" />
<CustomBuild Include="ShaderCompiler.cpp" />
<CustomBuild Include="ShaderCompiler.h" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{534b94ed-6c94-4f93-bc2a-7f5284b7d434}</ProjectGuid> <ProjectGuid>{c7df05fe-d5d5-db2a-af36-e7d71d325fda}</ProjectGuid>
<Keyword>MakeFileProj</Keyword> <Keyword>MakeFileProj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -32,75 +23,72 @@
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommandArguments>..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil</LocalDebuggerCommandArguments>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommandArguments>..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil</LocalDebuggerCommandArguments>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommandArguments>..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil</LocalDebuggerCommandArguments>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </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)'=='Profile|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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Debug $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Debug $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Debug $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Debug\JulietShaderCompiler.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerCommandArguments>..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil</LocalDebuggerCommandArguments>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Debug\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Debug\JulietShaderCompiler\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Debug\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Profile $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Profile $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Profile $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Profile\JulietShaderCompiler.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerCommandArguments>..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil</LocalDebuggerCommandArguments>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Profile\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Profile\JulietShaderCompiler\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Profile\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Release $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Release $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Release $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Release\JulietShaderCompiler.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerCommandArguments>..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil</LocalDebuggerCommandArguments>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Release\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Release\JulietShaderCompiler\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Release\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemGroup>
<BuildLog> <ClCompile Include="main.cpp" />
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path> <ClCompile Include="ShaderCompiler.cpp" />
</BuildLog> <ClInclude Include="DXShaderCompiler\DXCompiler.h" />
</ItemDefinitionGroup> <ClInclude Include="ShaderCompiler.h" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> </ItemGroup>
<BuildLog>
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path>
</BuildLog>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<BuildLog>
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path>
</BuildLog>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
<Import Condition="'$(ConfigurationType)' == 'Makefile' and '$(AndroidAPILevel)' != '' and Exists('$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets')" Project="$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets" />
</Project> </Project>
JulietShaderCompiler/JulietShaderCompiler.vcxproj.filters
+8 -14
View File
@@ -1,21 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<CustomBuild Include="DXShaderCompiler\DXCompiler.h">
<Filter>DXShaderCompiler</Filter>
</CustomBuild>
<CustomBuild Include="JulietShaderCompiler.bff">
</CustomBuild>
<CustomBuild Include="main.cpp">
</CustomBuild>
<CustomBuild Include="ShaderCompiler.cpp">
</CustomBuild>
<CustomBuild Include="ShaderCompiler.h">
</CustomBuild>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="DXShaderCompiler"> <Filter Include="DXShaderCompiler">
<UniqueIdentifier>{9f537123-6c94-4f93-bc2a-7f5284b7d434}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp" />
<ClCompile Include="ShaderCompiler.cpp" />
<ClInclude Include="DXShaderCompiler\DXCompiler.h">
<Filter>DXShaderCompiler</Filter>
</ClInclude>
<ClInclude Include="ShaderCompiler.h" />
</ItemGroup>
</Project> </Project>
Romeo.sln
+23 -17
View File
@@ -1,12 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio Version 17
VisualStudioVersion = 14.0.22823.1 VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\ImGui.vcxproj", "{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Romeo", "Romeo\Romeo.vcxproj", "{767620a7-b286-e7a1-9f79-3e14ce9e5ab1}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Romeo", "Romeo\Romeo.vcxproj", "{05CD1167-6C94-4F93-BC2A-7F5284B7D434}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\imgui\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,18 +15,24 @@ Global
Release|x64 = Release|x64 Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.ActiveCfg = Debug|x64 {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Debug|x64.ActiveCfg = Debug|x64
{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.ActiveCfg = Profile|x64 {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Debug|x64.Build.0 = Debug|x64
{C16FFE36-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.ActiveCfg = Release|x64 {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Profile|x64.ActiveCfg = Profile|x64
{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.ActiveCfg = Debug|x64 {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Profile|x64.Build.0 = Profile|x64
{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.ActiveCfg = Profile|x64 {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Release|x64.ActiveCfg = Release|x64
{AB9C7E88-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.ActiveCfg = Release|x64 {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Release|x64.Build.0 = Release|x64
{05CD1167-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.ActiveCfg = Debug|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Debug|x64.ActiveCfg = Debug|x64
{05CD1167-6C94-4F93-BC2A-7F5284B7D434}.Debug|x64.Build.0 = Debug|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Debug|x64.Build.0 = Debug|x64
{05CD1167-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.ActiveCfg = Profile|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Profile|x64.ActiveCfg = Profile|x64
{05CD1167-6C94-4F93-BC2A-7F5284B7D434}.Profile|x64.Build.0 = Profile|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Profile|x64.Build.0 = Profile|x64
{05CD1167-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.ActiveCfg = Release|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Release|x64.ActiveCfg = Release|x64
{05CD1167-6C94-4F93-BC2A-7F5284B7D434}.Release|x64.Build.0 = Release|x64 {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Release|x64.Build.0 = Release|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Debug|x64.ActiveCfg = Debug|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Debug|x64.Build.0 = Debug|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Profile|x64.ActiveCfg = Profile|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Profile|x64.Build.0 = Profile|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Release|x64.ActiveCfg = Release|x64
{652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
Romeo/Romeo.vcxproj
+51 -63
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
@@ -14,24 +14,8 @@
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup>
<CustomBuild Include="Romeo.bff" />
<CustomBuild Include="src\AiGenerator.cpp" />
<CustomBuild Include="src\AiGenerator.h" />
<CustomBuild Include="src\Database.cpp" />
<CustomBuild Include="src\Database.h" />
<CustomBuild Include="src\HttpClient.cpp" />
<CustomBuild Include="src\HttpClient.h" />
<CustomBuild Include="src\JsonParser.cpp" />
<CustomBuild Include="src\JsonParser.h" />
<CustomBuild Include="src\main.cpp" />
<CustomBuild Include="src\MarkdownGenerator.cpp" />
<CustomBuild Include="src\MarkdownGenerator.h" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{05cd1167-6c94-4f93-bc2a-7f5284b7d434}</ProjectGuid> <ProjectGuid>{767620a7-b286-e7a1-9f79-3e14ce9e5ab1}</ProjectGuid>
<Keyword>MakeFileProj</Keyword> <Keyword>MakeFileProj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -39,72 +23,76 @@
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType> <ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<LocalDebuggerCommand>$(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe</LocalDebuggerCommand>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </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)'=='Profile|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 Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Debug $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Debug $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Debug $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Debug\Romeo.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Debug\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Debug\Romeo\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Debug\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Profile $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Profile $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Profile $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Profile\Romeo.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Profile\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Profile\Romeo\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Profile\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat $(Configuration) $(SolutionName)</NMakeBuildCommandLine> <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat Release $(SolutionName)</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean $(Configuration) $(SolutionName)</NMakeReBuildCommandLine> <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Release $(SolutionName)</NMakeReBuildCommandLine>
<LocalDebuggerWorkingDirectory>$(SolutionDir)\bin\x64-$(Configuration)\</LocalDebuggerWorkingDirectory> <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\build.bat -clean Release $(SolutionName)</NMakeCleanCommandLine>
<IntDir>$(SolutionDir)\Intermediate</IntDir> <NMakeOutput>$(SolutionDir)bin\x64-Release\Romeo.exe</NMakeOutput>
<OutDir>$(SolutionDir)\bin</OutDir> <NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
<LocalDebuggerWorkingDirectory>$(SolutionDir)bin\x64-Release\</LocalDebuggerWorkingDirectory>
<IntDir>$(SolutionDir)Intermediate\x64-Release\Romeo\</IntDir>
<OutDir>$(SolutionDir)bin\x64-Release\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemGroup>
<BuildLog> <ClCompile Include="src\AiGenerator.cpp" />
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path> <ClCompile Include="src\Database.cpp" />
</BuildLog> <ClCompile Include="src\HttpClient.cpp" />
</ItemDefinitionGroup> <ClCompile Include="src\JsonParser.cpp" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> <ClCompile Include="src\main.cpp" />
<BuildLog> <ClCompile Include="src\MarkdownGenerator.cpp" />
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path> <ClInclude Include="src\AiGenerator.h" />
</BuildLog> <ClInclude Include="src\Database.h" />
</ItemDefinitionGroup> <ClInclude Include="src\HttpClient.h" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClInclude Include="src\JsonParser.h" />
<BuildLog> <ClInclude Include="src\MarkdownGenerator.h" />
<Path>$(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log</Path> </ItemGroup>
</BuildLog>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
<Import Condition="'$(ConfigurationType)' == 'Makefile' and Exists('$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets')" Project="$(VCTargetsPath)\Platforms\$(Platform)\SCE.Makefile.$(Platform).targets" />
<Import Condition="'$(ConfigurationType)' == 'Makefile' and '$(AndroidAPILevel)' != '' and Exists('$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets')" Project="$(VCTargetsPath)\Application Type\$(ApplicationType)\$(ApplicationTypeRevision)\Android.Common.targets" />
</Project> </Project>
Romeo/Romeo.vcxproj.filters
+35 -38
View File
@@ -1,45 +1,42 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<CustomBuild Include="Romeo.bff">
</CustomBuild>
<CustomBuild Include="src\AiGenerator.cpp">
<Filter>src</Filter>
</CustomBuild>
<CustomBuild Include="src\AiGenerator.h">
<Filter>src</Filter>
</CustomBuild>
<CustomBuild Include="src\Database.cpp">
<Filter>src</Filter>
</CustomBuild>
<CustomBuild Include="src\Database.h">
<Filter>src</Filter>
</CustomBuild>
<CustomBuild Include="src\HttpClient.cpp">
<Filter>src</Filter>
</CustomBuild>
<CustomBuild Include="src\HttpClient.h">
<Filter>src</Filter>
</CustomBuild>
<CustomBuild Include="src\JsonParser.cpp">
<Filter>src</Filter>
</CustomBuild>
<CustomBuild Include="src\JsonParser.h">
<Filter>src</Filter>
</CustomBuild>
<CustomBuild Include="src\main.cpp">
<Filter>src</Filter>
</CustomBuild>
<CustomBuild Include="src\MarkdownGenerator.cpp">
<Filter>src</Filter>
</CustomBuild>
<CustomBuild Include="src\MarkdownGenerator.h">
<Filter>src</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="src"> <Filter Include="src">
<UniqueIdentifier>{58a44f9c-6c94-4f93-bc2a-7f5284b7d434}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ClCompile Include="src\AiGenerator.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\Database.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\HttpClient.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\JsonParser.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\MarkdownGenerator.cpp">
<Filter>src</Filter>
</ClCompile>
<ClInclude Include="src\AiGenerator.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Database.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\HttpClient.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\JsonParser.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\MarkdownGenerator.h">
<Filter>src</Filter>
</ClInclude>
</ItemGroup>
</Project> </Project>
misc/Generate.bat
+60 -1
View File
@@ -4,8 +4,67 @@ setlocal
set SCRIPT_DIR=%~dp0 set SCRIPT_DIR=%~dp0
cd /d "%SCRIPT_DIR%.." cd /d "%SCRIPT_DIR%.."
if not exist "Intermediate" mkdir "Intermediate"
echo Generating Visual Studio / Rider solution and project files... echo Generating Visual Studio / Rider solution and project files...
misc\fbuild.exe gen
set PLAN=Intermediate\vs_plan.txt
if exist "%PLAN%" del /f /q "%PLAN%"
>>"%PLAN%" echo GLOBAL_INCLUDE $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;
>>"%PLAN%" echo DEF_COMMON JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;
>>"%PLAN%" echo DEF_DEBUG DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;
>>"%PLAN%" echo DEF_PROFILE RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;
>>"%PLAN%" echo DEF_RELEASE RELEASE;
>>"%PLAN%" echo PROJECT Juliet
>>"%PLAN%" echo EXTRA_DEF JULIET_EXPORT;
>>"%PLAN%" echo PROJECT Game
>>"%PLAN%" echo EXTRA_DEF JULIET_EXPORT;
>>"%PLAN%" echo PROJECT JulietApp
>>"%PLAN%" echo PROJECT Romeo
>>"%PLAN%" echo PROJECT JulietShaderCompiler
>>"%PLAN%" echo INCLUDE_SEARCH $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;
>>"%PLAN%" echo DEBUG_CMD ..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil
>>"%PLAN%" echo PROJECT ImGui External\imgui
>>"%PLAN%" echo EXTRA_DEF IMGUI_API=__declspec(dllexport);
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui_demo.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui_draw.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui_tables.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui_widgets.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\backends\imgui_impl_win32.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\backends\imgui_impl_dx12.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui_internal.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\imstb_rectpack.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\imstb_textedit.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\imstb_truetype.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\backends\imgui_impl_win32.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\backends\imgui_impl_dx12.h
>>"%PLAN%" echo SOLUTION Juliet
>>"%PLAN%" echo SLN_PROJ JulietApp
>>"%PLAN%" echo SLN_PROJ Juliet
>>"%PLAN%" echo SLN_PROJ Game
>>"%PLAN%" echo SLN_PROJ ImGui
>>"%PLAN%" echo SOLUTION Romeo
>>"%PLAN%" echo SLN_PROJ Romeo
>>"%PLAN%" echo SLN_PROJ Juliet
>>"%PLAN%" echo SLN_PROJ ImGui
>>"%PLAN%" echo SOLUTION JulietShaderCompiler
>>"%PLAN%" echo SLN_PROJ JulietShaderCompiler
>>"%PLAN%" echo SLN_PROJ Juliet
>>"%PLAN%" echo SLN_PROJ ImGui
call misc\build.bat gen_vs "%PLAN%"
if %ERRORLEVEL% neq 0 ( if %ERRORLEVEL% neq 0 (
echo Solution generation failed! echo Solution generation failed!
misc/build.bat
+19 -5
View File
@@ -27,6 +27,11 @@ set CONFIG_SPECIFIED=0
:parse_args :parse_args
if "%~1"=="" goto check_defaults if "%~1"=="" goto check_defaults
if /i "%~1"=="gen_vs" (
set COMMAND_GEN_VS=1
set GEN_VS_PLAN=%~2
goto do_compile_build_tool
)
if /i "%~1"=="debug" set CONFIG_DEBUG=1& set CONFIG_SPECIFIED=1 if /i "%~1"=="debug" set CONFIG_DEBUG=1& set CONFIG_SPECIFIED=1
if /i "%~1"=="release" set CONFIG_RELEASE=1& set CONFIG_SPECIFIED=1 if /i "%~1"=="release" set CONFIG_RELEASE=1& set CONFIG_SPECIFIED=1
if /i "%~1"=="profile" set CONFIG_PROFILE=1& set CONFIG_SPECIFIED=1 if /i "%~1"=="profile" set CONFIG_PROFILE=1& set CONFIG_SPECIFIED=1
@@ -41,7 +46,7 @@ goto parse_args
if !CONFIG_SPECIFIED! equ 0 set CONFIG_DEBUG=1& if !TARGET_SPECIFIED! equ 0 set CONFIG_RELEASE=1& set CONFIG_PROFILE=1 if !CONFIG_SPECIFIED! equ 0 set CONFIG_DEBUG=1& if !TARGET_SPECIFIED! equ 0 set CONFIG_RELEASE=1& set CONFIG_PROFILE=1
if !TARGET_SPECIFIED! equ 0 set TARGET_JULIET=1& set TARGET_GAME=1& set TARGET_ROMEO=1& set TARGET_SHADER=1 if !TARGET_SPECIFIED! equ 0 set TARGET_JULIET=1& set TARGET_GAME=1& set TARGET_ROMEO=1& set TARGET_SHADER=1
:start_build :do_compile_build_tool
if not exist "%FBUILD%" ( if not exist "%FBUILD%" (
echo [BUILD FAILED] Could not find %FBUILD%. echo [BUILD FAILED] Could not find %FBUILD%.
exit /b 1 exit /b 1
@@ -60,7 +65,7 @@ if !ERRORLEVEL! neq 0 (
) )
:: Check if build.exe needs to be compiled (missing, version changed, or source changed) :: Check if build.exe needs to be compiled (missing, version changed, or source changed)
set BUILD_TOOL_VER=4 set BUILD_TOOL_VER=11
set NEED_RECOMPILE_BUILD_TOOL=0 set NEED_RECOMPILE_BUILD_TOOL=0
if not exist "%BUILD_TOOL%" ( if not exist "%BUILD_TOOL%" (
set NEED_RECOMPILE_BUILD_TOOL=1 set NEED_RECOMPILE_BUILD_TOOL=1
@@ -109,6 +114,12 @@ if !NEED_RECOMPILE_BUILD_TOOL! equ 1 (
for %%I in ("%BUILD_SRC%") do (echo %%~tI)>"Intermediate\build_tool.stamp" for %%I in ("%BUILD_SRC%") do (echo %%~tI)>"Intermediate\build_tool.stamp"
) )
if "!COMMAND_GEN_VS!"=="1" (
echo [BUILD] Generating Visual Studio Projects and Solutions...
"%BUILD_TOOL%" gen_vs "!GEN_VS_PLAN!"
exit /b !ERRORLEVEL!
)
echo [BUILD] Generating Build Plan... echo [BUILD] Generating Build Plan...
set PLAN_FILE=Intermediate\build_plan.txt set PLAN_FILE=Intermediate\build_plan.txt
if exist "!PLAN_FILE!" del /f /q "!PLAN_FILE!" if exist "!PLAN_FILE!" del /f /q "!PLAN_FILE!"
@@ -183,10 +194,13 @@ echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllexport^) /DJ
:: --- Game.dll --- :: --- Game.dll ---
if !BUILD_GAME_DLL! equ 1 ( if !BUILD_GAME_DLL! equ 1 (
echo STEP Building Game.dll [!CFG!]>>"!PLAN_FILE!" set "GAME_DLL_NAME=Game"
echo OUTPUT bin\x64-!CFG!\Game.dll>>"!PLAN_FILE!" if defined GAME_BUILD_ID set "GAME_DLL_NAME=Game-!GAME_BUILD_ID!"
echo STEP Building !GAME_DLL_NAME!.dll [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT bin\x64-!CFG!\!GAME_DLL_NAME!.dll>>"!PLAN_FILE!"
echo DEPENDS Game^|Juliet^|External\imgui>>"!PLAN_FILE!" echo DEPENDS Game^|Juliet^|External\imgui>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /DJULIET_EXPORT /LD /Fe"bin\x64-!CFG!\Game.dll" Intermediate\Game\*.cpp /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Game.ilk /PDB:Intermediate\x64-!CFG!\Game.pdb>>"!PLAN_FILE!" echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /DJULIET_EXPORT /LD /Fe"bin\x64-!CFG!\!GAME_DLL_NAME!.dll" Intermediate\Game\*.cpp /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /INCREMENTAL /ILK:Intermediate\x64-!CFG!\!GAME_DLL_NAME!.ilk /PDB:Intermediate\x64-!CFG!\!GAME_DLL_NAME!.pdb>>"!PLAN_FILE!"
) )
:: --- JulietApp.exe --- :: --- JulietApp.exe ---
misc/build_game.bat
+18 -17
View File
@@ -1,37 +1,35 @@
@echo off @echo off
setlocal setlocal
:: --- 1. Handle Compiler Choice --- :: --- 1. Handle Config Choice ---
:: Default to Clang, but allow override via "build_game.bat msvc" :: Default to debug config, but allow override
set "COMPILER_TYPE=%~1" set "CONFIG_ARG=%~1"
if "%COMPILER_TYPE%"=="" set "COMPILER_TYPE=clang" if /I "%CONFIG_ARG%"=="" set "CONFIG_ARG=debug"
if /I "%CONFIG_ARG%"=="clang" set "CONFIG_ARG=debug"
if /I "%CONFIG_ARG%"=="msvc" set "CONFIG_ARG=debug"
if /I "%COMPILER_TYPE%"=="clang" ( set "CONFIG=Debug"
set "PLATFORM=x64Clang" if /I "%CONFIG_ARG%"=="profile" set "CONFIG=Profile"
) else ( if /I "%CONFIG_ARG%"=="release" set "CONFIG=Release"
set "PLATFORM=x64"
)
:: --- 2. Generate Random ID & Setup Paths --- :: --- 2. Generate Random ID & Setup Paths ---
set "CONFIG=Debug"
set "GAME_BUILD_ID=%RANDOM%" set "GAME_BUILD_ID=%RANDOM%"
set "TARGET=Game-%PLATFORM%-%CONFIG%" set "OUT_DIR=%~dp0..\bin\x64-%CONFIG%"
set "OUT_DIR=%~dp0..\bin\%PLATFORM%-%CONFIG%"
echo --- Building %TARGET% (ID: %GAME_BUILD_ID%) --- echo --- Building Game (ID: %GAME_BUILD_ID%) [%CONFIG%] ---
:: --- 3. Manage Lock File --- :: --- 3. Manage Lock File ---
if not exist "%OUT_DIR%" mkdir "%OUT_DIR%" if not exist "%OUT_DIR%" mkdir "%OUT_DIR%"
pushd "%OUT_DIR%" pushd "%OUT_DIR%"
:: Clean up old DLLs/PDBs in this folder to prevent clutter :: Clean up old DLLs/PDBs in this folder to prevent clutter
del Game-*.dll Game-*.pdb > NUL 2> NUL del Game-*.dll Game-*.pdb Game-*.ilk Game-*.exp Game-*.lib > NUL 2> NUL
echo %GAME_BUILD_ID% > lock.tmp echo %GAME_BUILD_ID% > lock.tmp
popd popd
:: --- 4. Run FASTBuild --- :: --- 4. Run Build System ---
:: We pass the ID via an Environment Variable so the .bff can read it :: Pass GAME_BUILD_ID environment variable so build.bat can use it
set "GAME_BUILD_ID=%GAME_BUILD_ID%" set "GAME_BUILD_ID=%GAME_BUILD_ID%"
fbuild %TARGET% -cache call "%~dp0build.bat" %CONFIG_ARG% game
if %ERRORLEVEL% NEQ 0 ( if %ERRORLEVEL% NEQ 0 (
echo. echo.
@@ -39,6 +37,9 @@ if %ERRORLEVEL% NEQ 0 (
goto :cleanup goto :cleanup
) )
:: Copy output to Game.dll for the engine to load
copy /y "%OUT_DIR%\Game-%GAME_BUILD_ID%.dll" "%OUT_DIR%\Game.dll" > NUL
echo. echo.
echo SUCCESS: Generated %OUT_DIR%\Game-%GAME_BUILD_ID%.dll echo SUCCESS: Generated %OUT_DIR%\Game-%GAME_BUILD_ID%.dll
tools/build_system.c
+463
View File
@@ -844,6 +844,467 @@ static int CommandRunPlan(int argc, char* argv[])
return 0; return 0;
} }
static void GenerateProject(const char* projectName, const char* projectDir, const char* guid, const char* includeSearchPath, const char* extraDefs, const char* debuggerCommandArgs, const char Srcs[64][256], int SrcCount, const char* defCommon, const char* defDebug, const char* defProfile, const char* defRelease)
{
FilePathList* srcFiles = CreateFilePathList();
if (SrcCount > 0) {
for (int i = 0; i < SrcCount; i++) {
FilePathListAdd(srcFiles, Srcs[i]);
}
} else {
CollectFiles(projectDir, NULL, ".cpp", srcFiles);
CollectFiles(projectDir, NULL, ".c", srcFiles);
CollectFiles(projectDir, NULL, ".h", srcFiles);
CollectFiles(projectDir, NULL, ".hpp", srcFiles);
CollectFiles(projectDir, NULL, ".inl", srcFiles);
}
char* buf = (char*)ArenaPush(4 * 1024 * 1024);
int offset = 0;
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
"<Project DefaultTargets=\"Build\" ToolsVersion=\"17.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
" <ItemGroup Label=\"ProjectConfigurations\">\n"
" <ProjectConfiguration Include=\"Debug|x64\">\n"
" <Configuration>Debug</Configuration>\n"
" <Platform>x64</Platform>\n"
" </ProjectConfiguration>\n"
" <ProjectConfiguration Include=\"Profile|x64\">\n"
" <Configuration>Profile</Configuration>\n"
" <Platform>x64</Platform>\n"
" </ProjectConfiguration>\n"
" <ProjectConfiguration Include=\"Release|x64\">\n"
" <Configuration>Release</Configuration>\n"
" <Platform>x64</Platform>\n"
" </ProjectConfiguration>\n"
" </ItemGroup>\n"
" <PropertyGroup Label=\"Globals\">\n"
" <ProjectGuid>{%s}</ProjectGuid>\n"
" <Keyword>MakeFileProj</Keyword>\n"
" </PropertyGroup>\n"
" <Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />\n", guid);
const char* configs[] = { "Debug", "Profile", "Release" };
for (int i = 0; i < 3; i++) {
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" <PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='%s|x64'\" Label=\"Configuration\">\n"
" <ConfigurationType>Makefile</ConfigurationType>\n"
" <UseDebugLibraries>false</UseDebugLibraries>\n"
" <PlatformToolset>v143</PlatformToolset>\n"
" </PropertyGroup>\n", configs[i]);
}
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" <Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.props\" />\n"
" <ImportGroup Label=\"ExtensionSettings\">\n"
" </ImportGroup>\n");
for (int i = 0; i < 3; i++) {
const char* cfg = configs[i];
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" <PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='%s|x64'\">\n"
" <NMakeBuildCommandLine>cd $(SolutionDir) &amp; misc\\build.bat %s $(SolutionName)</NMakeBuildCommandLine>\n"
" <NMakeReBuildCommandLine>cd $(SolutionDir) &amp; misc\\build.bat -clean %s $(SolutionName)</NMakeReBuildCommandLine>\n"
" <NMakeCleanCommandLine>cd $(SolutionDir) &amp; misc\\build.bat -clean %s $(SolutionName)</NMakeCleanCommandLine>\n"
" <NMakeOutput>$(SolutionDir)bin\\x64-%s\\%s.exe</NMakeOutput>\n"
" <NMakeIncludeSearchPath>%s$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>\n"
" <IncludePath>%s$(IncludePath)</IncludePath>\n",
cfg, cfg, cfg, cfg, cfg, projectName, includeSearchPath, includeSearchPath);
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" <NMakePreprocessorDefinitions>");
if (defCommon && defCommon[0]) offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, "%s", defCommon);
if (strcmp(cfg, "Debug") == 0 && defDebug && defDebug[0]) offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, "%s", defDebug);
else if (strcmp(cfg, "Profile") == 0 && defProfile && defProfile[0]) offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, "%s", defProfile);
else if (strcmp(cfg, "Release") == 0 && defRelease && defRelease[0]) offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, "%s", defRelease);
if (extraDefs && extraDefs[0]) offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, "%s", extraDefs);
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, "$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\n"
" <AdditionalOptions>/std:c++20</AdditionalOptions>\n"
" <LanguageStandard>stdcpp20</LanguageStandard>\n");
if (debuggerCommandArgs && debuggerCommandArgs[0] != '\0') {
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" <LocalDebuggerCommandArguments>%s</LocalDebuggerCommandArguments>\n", debuggerCommandArgs);
}
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" <LocalDebuggerWorkingDirectory>$(SolutionDir)bin\\x64-%s\\</LocalDebuggerWorkingDirectory>\n"
" <IntDir>$(SolutionDir)Intermediate\\x64-%s\\%s\\</IntDir>\n"
" <OutDir>$(SolutionDir)bin\\x64-%s\\</OutDir>\n"
" </PropertyGroup>\n", cfg, cfg, projectName, cfg);
}
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, " <ItemGroup>\n");
int projectDirLen = (int)strlen(projectDir);
for (int i = 0; i < srcFiles->Count; i++) {
const char* path = srcFiles->Paths[i];
const char* relPath = path;
if (strncmp(path, projectDir, projectDirLen) == 0 && (path[projectDirLen] == '\\' || path[projectDirLen] == '/')) {
relPath = path + projectDirLen + 1;
}
if (EndsWithNoCase(path, ".cpp") || EndsWithNoCase(path, ".c")) {
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, " <ClCompile Include=\"%s\" />\n", relPath);
} else {
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, " <ClInclude Include=\"%s\" />\n", relPath);
}
}
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, " </ItemGroup>\n");
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" <Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.targets\" />\n"
" <ImportGroup Label=\"ExtensionTargets\">\n"
" </ImportGroup>\n"
"</Project>\n");
char outPath[MAX_PATH_LEN];
snprintf(outPath, sizeof(outPath), "%s\\%s.vcxproj", projectDir, projectName);
WriteEntireFile(outPath, buf, offset);
printf("Generated %s\n", outPath);
// --- Generate .vcxproj.filters ---
char filters[512][256];
int filterCount = 0;
for (int i = 0; i < srcFiles->Count; i++) {
const char* path = srcFiles->Paths[i];
const char* relPath = path;
if (strncmp(path, projectDir, projectDirLen) == 0 && (path[projectDirLen] == '\\' || path[projectDirLen] == '/')) {
relPath = path + projectDirLen + 1;
}
const char* lastSlash = strrchr(relPath, '\\');
if (!lastSlash) lastSlash = strrchr(relPath, '/');
if (lastSlash) {
char dir[256];
int len = (int)(lastSlash - relPath);
if (len >= 256) len = 255;
memcpy(dir, relPath, len);
dir[len] = '\0';
char cur[256];
int c = 0;
for (int k = 0; k < len; k++) {
cur[c++] = dir[k];
if (dir[k] == '\\' || dir[k] == '/') {
cur[c - 1] = '\0';
bool found = false;
for (int f = 0; f < filterCount; f++) {
if (_stricmp(filters[f], cur) == 0) { found = true; break; }
}
if (!found && filterCount < 512) {
strcpy_s(filters[filterCount++], 256, cur);
}
cur[c - 1] = '\\';
}
}
bool found = false;
for (int f = 0; f < filterCount; f++) {
if (_stricmp(filters[f], dir) == 0) { found = true; break; }
}
if (!found && filterCount < 512) {
strcpy_s(filters[filterCount++], 256, dir);
}
}
}
char* filterBuf = (char*)ArenaPush(4 * 1024 * 1024);
int filterOffset = 0;
filterOffset += sprintf_s(filterBuf + filterOffset, (4 * 1024 * 1024) - filterOffset,
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
"<Project ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n"
" <ItemGroup>\n");
for (int i = 0; i < filterCount; i++) {
filterOffset += sprintf_s(filterBuf + filterOffset, (4 * 1024 * 1024) - filterOffset,
" <Filter Include=\"%s\">\n"
" </Filter>\n", filters[i]);
}
filterOffset += sprintf_s(filterBuf + filterOffset, (4 * 1024 * 1024) - filterOffset,
" </ItemGroup>\n"
" <ItemGroup>\n");
for (int i = 0; i < srcFiles->Count; i++) {
const char* path = srcFiles->Paths[i];
const char* relPath = path;
if (strncmp(path, projectDir, projectDirLen) == 0 && (path[projectDirLen] == '\\' || path[projectDirLen] == '/')) {
relPath = path + projectDirLen + 1;
}
const char* lastSlash = strrchr(relPath, '\\');
if (!lastSlash) lastSlash = strrchr(relPath, '/');
const char* type = (EndsWithNoCase(path, ".cpp") || EndsWithNoCase(path, ".c")) ? "ClCompile" : "ClInclude";
if (lastSlash) {
char dir[256];
int len = (int)(lastSlash - relPath);
if (len >= 256) len = 255;
memcpy(dir, relPath, len);
dir[len] = '\0';
filterOffset += sprintf_s(filterBuf + filterOffset, (4 * 1024 * 1024) - filterOffset,
" <%s Include=\"%s\">\n"
" <Filter>%s</Filter>\n"
" </%s>\n", type, relPath, dir, type);
} else {
filterOffset += sprintf_s(filterBuf + filterOffset, (4 * 1024 * 1024) - filterOffset,
" <%s Include=\"%s\" />\n", type, relPath);
}
}
filterOffset += sprintf_s(filterBuf + filterOffset, (4 * 1024 * 1024) - filterOffset,
" </ItemGroup>\n</Project>\n");
char filterOutPath[MAX_PATH_LEN];
snprintf(filterOutPath, sizeof(filterOutPath), "%s\\%s.vcxproj.filters", projectDir, projectName);
WriteEntireFile(filterOutPath, filterBuf, filterOffset);
printf("Generated %s\n", filterOutPath);
}
static void GenerateSolution(const char* slnName, const char** projectNames, const char** projectDirs, const char** projectGuids, int projCount)
{
char* buf = (char*)ArenaPush(4 * 1024 * 1024);
int offset = 0;
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
"Microsoft Visual Studio Solution File, Format Version 12.00\n"
"# Visual Studio Version 17\n"
"VisualStudioVersion = 17.0.31903.59\n"
"MinimumVisualStudioVersion = 10.0.40219.1\n");
for (int i = 0; i < projCount; i++) {
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
"Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"%s\", \"%s\\%s.vcxproj\", \"{%s}\"\n"
"EndProject\n", projectNames[i], projectDirs[i], projectNames[i], projectGuids[i]);
}
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
"Global\n"
" GlobalSection(SolutionConfigurationPlatforms) = preSolution\n"
" Debug|x64 = Debug|x64\n"
" Profile|x64 = Profile|x64\n"
" Release|x64 = Release|x64\n"
" EndGlobalSection\n"
" GlobalSection(ProjectConfigurationPlatforms) = postSolution\n");
for (int i = 0; i < projCount; i++) {
const char* configs[] = { "Debug", "Profile", "Release" };
for (int c = 0; c < 3; c++) {
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" {%s}.%s|x64.ActiveCfg = %s|x64\n"
" {%s}.%s|x64.Build.0 = %s|x64\n",
projectGuids[i], configs[c], configs[c],
projectGuids[i], configs[c], configs[c]);
}
}
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" EndGlobalSection\n"
" GlobalSection(SolutionProperties) = preSolution\n"
" HideSolutionNode = FALSE\n"
" EndGlobalSection\n"
"EndGlobal\n");
char outPath[MAX_PATH_LEN];
snprintf(outPath, sizeof(outPath), "%s.sln", slnName);
WriteEntireFile(outPath, buf, offset);
printf("Generated %s\n", outPath);
}
typedef struct {
char Name[64];
char Dir[256];
char Guid[64];
char ExtraDef[1024];
char IncludeSearch[1024];
char DebugCmd[1024];
char Srcs[64][256];
int SrcCount;
} VSProject;
typedef struct {
char Name[64];
char Projects[16][64];
int ProjCount;
} VSSolution;
static void GenerateDeterministicGuid(const char* input, char* outputGuid) {
unsigned long long hash1 = 14695981039346656037ULL;
unsigned long long hash2 = 1099511628211ULL;
for (const char* c = input; *c; ++c) {
hash1 ^= (unsigned long long)(*c);
hash1 *= 1099511628211ULL;
hash2 ^= (unsigned long long)(*c);
hash2 *= 137ULL;
}
sprintf_s(outputGuid, 64, "%08x-%04x-%04x-%04x-%012llx",
(unsigned int)(hash1 >> 32),
(unsigned int)((hash1 >> 16) & 0xFFFF),
(unsigned int)(hash1 & 0xFFFF),
(unsigned int)((hash2 >> 48) & 0xFFFF),
hash2 & 0xFFFFFFFFFFFFULL);
}
static int CommandGenVS(int argc, char* argv[])
{
if (argc < 3) {
printf("[ERROR] Usage: build_system gen_vs <plan_file>\n");
return 1;
}
const char* planFile = argv[2];
FileContent planContent = ReadEntireFile(planFile);
if (!planContent.Data) {
printf("[ERROR] Could not read VS plan: %s\n", planFile);
return 1;
}
char globalInclude[1024] = {0};
char globalDefCommon[1024] = {0};
char globalDefDebug[1024] = {0};
char globalDefProfile[1024] = {0};
char globalDefRelease[1024] = {0};
VSProject projects[16];
int projCount = 0;
VSSolution solutions[8];
int slnCount = 0;
const char* pos = planContent.Data;
while (*pos) {
const char* lineStart = pos;
while (*pos && *pos != '\n' && *pos != '\r') pos++;
int lineLen = (int)(pos - lineStart);
if (lineLen > 0) {
if (lineLen > 15 && memcmp(lineStart, "GLOBAL_INCLUDE ", 15) == 0) {
int nLen = lineLen - 15;
if (nLen >= 1024) nLen = 1023;
memcpy(globalInclude, lineStart + 15, nLen);
globalInclude[nLen] = '\0';
}
else if (lineLen > 11 && memcmp(lineStart, "DEF_COMMON ", 11) == 0) {
int nLen = lineLen - 11;
if (nLen >= 1024) nLen = 1023;
memcpy(globalDefCommon, lineStart + 11, nLen);
globalDefCommon[nLen] = '\0';
}
else if (lineLen > 10 && memcmp(lineStart, "DEF_DEBUG ", 10) == 0) {
int nLen = lineLen - 10;
if (nLen >= 1024) nLen = 1023;
memcpy(globalDefDebug, lineStart + 10, nLen);
globalDefDebug[nLen] = '\0';
}
else if (lineLen > 12 && memcmp(lineStart, "DEF_PROFILE ", 12) == 0) {
int nLen = lineLen - 12;
if (nLen >= 1024) nLen = 1023;
memcpy(globalDefProfile, lineStart + 12, nLen);
globalDefProfile[nLen] = '\0';
}
else if (lineLen > 12 && memcmp(lineStart, "DEF_RELEASE ", 12) == 0) {
int nLen = lineLen - 12;
if (nLen >= 1024) nLen = 1023;
memcpy(globalDefRelease, lineStart + 12, nLen);
globalDefRelease[nLen] = '\0';
}
else if (lineLen > 8 && memcmp(lineStart, "PROJECT ", 8) == 0) {
if (projCount < 16) {
VSProject* p = &projects[projCount++];
memset(p, 0, sizeof(VSProject));
char lineBuf[1024];
int nLen = lineLen - 8;
if (nLen >= 1024) nLen = 1023;
memcpy(lineBuf, lineStart + 8, nLen);
lineBuf[nLen] = '\0';
int scanned = sscanf_s(lineBuf, "%s %s %s", p->Name, (unsigned)_countof(p->Name), p->Dir, (unsigned)_countof(p->Dir), p->Guid, (unsigned)_countof(p->Guid));
if (scanned < 2) {
strcpy_s(p->Dir, sizeof(p->Dir), p->Name);
}
if (scanned < 3) {
GenerateDeterministicGuid(p->Name, p->Guid);
}
}
}
else if (lineLen > 12 && memcmp(lineStart, "PROJECT_SRC ", 12) == 0 && projCount > 0) {
VSProject* p = &projects[projCount - 1];
if (p->SrcCount < 64) {
int nLen = lineLen - 12;
if (nLen >= 256) nLen = 255;
memcpy(p->Srcs[p->SrcCount], lineStart + 12, nLen);
p->Srcs[p->SrcCount][nLen] = '\0';
p->SrcCount++;
}
}
else if (lineLen > 10 && memcmp(lineStart, "EXTRA_DEF ", 10) == 0 && projCount > 0) {
VSProject* p = &projects[projCount - 1];
int nLen = lineLen - 10;
if (nLen >= 1024) nLen = 1023;
memcpy(p->ExtraDef, lineStart + 10, nLen);
p->ExtraDef[nLen] = '\0';
}
else if (lineLen > 15 && memcmp(lineStart, "INCLUDE_SEARCH ", 15) == 0 && projCount > 0) {
VSProject* p = &projects[projCount - 1];
int nLen = lineLen - 15;
if (nLen >= 1024) nLen = 1023;
memcpy(p->IncludeSearch, lineStart + 15, nLen);
p->IncludeSearch[nLen] = '\0';
}
else if (lineLen > 10 && memcmp(lineStart, "DEBUG_CMD ", 10) == 0 && projCount > 0) {
VSProject* p = &projects[projCount - 1];
int nLen = lineLen - 10;
if (nLen >= 1024) nLen = 1023;
memcpy(p->DebugCmd, lineStart + 10, nLen);
p->DebugCmd[nLen] = '\0';
}
else if (lineLen > 9 && memcmp(lineStart, "SOLUTION ", 9) == 0) {
if (slnCount < 8) {
VSSolution* s = &solutions[slnCount++];
memset(s, 0, sizeof(VSSolution));
int nLen = lineLen - 9;
if (nLen >= 64) nLen = 63;
memcpy(s->Name, lineStart + 9, nLen);
s->Name[nLen] = '\0';
}
}
else if (lineLen > 9 && memcmp(lineStart, "SLN_PROJ ", 9) == 0 && slnCount > 0) {
VSSolution* s = &solutions[slnCount - 1];
if (s->ProjCount < 16) {
int nLen = lineLen - 9;
if (nLen >= 64) nLen = 63;
memcpy(s->Projects[s->ProjCount], lineStart + 9, nLen);
s->Projects[s->ProjCount][nLen] = '\0';
s->ProjCount++;
}
}
}
while (*pos == '\n' || *pos == '\r') pos++;
}
for (int i = 0; i < projCount; i++) {
VSProject* p = &projects[i];
const char* incs = p->IncludeSearch[0] != '\0' ? p->IncludeSearch : globalInclude;
GenerateProject(p->Name, p->Dir, p->Guid, incs, p->ExtraDef, p->DebugCmd, p->Srcs, p->SrcCount, globalDefCommon, globalDefDebug, globalDefProfile, globalDefRelease);
}
for (int i = 0; i < slnCount; i++) {
VSSolution* s = &solutions[i];
const char* pNames[16];
const char* pDirs[16];
const char* pGuids[16];
for (int j = 0; j < s->ProjCount; j++) {
pNames[j] = s->Projects[j];
for (int k = 0; k < projCount; k++) {
if (strcmp(projects[k].Name, s->Projects[j]) == 0) {
pDirs[j] = projects[k].Dir;
pGuids[j] = projects[k].Guid;
break;
}
}
}
GenerateSolution(s->Name, pNames, pDirs, pGuids, s->ProjCount);
}
return 0;
}
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
@@ -855,6 +1316,7 @@ int main(int argc, char* argv[])
printf("Usage: build_system <command> [args...]\n"); printf("Usage: build_system <command> [args...]\n");
printf("Commands:\n"); printf("Commands:\n");
printf(" run_plan <plan_file> Run the build from a generated plan file\n"); printf(" run_plan <plan_file> Run the build from a generated plan file\n");
printf(" gen_vs Generate Visual Studio project and solution files\n");
printf(" check_alive Returns 0 immediately to test execution\n"); printf(" check_alive Returns 0 immediately to test execution\n");
return 1; return 1;
} }
@@ -862,6 +1324,7 @@ int main(int argc, char* argv[])
const char* cmd = argv[1]; const char* cmd = argv[1];
if (strcmp(cmd, "check_alive") == 0) return 0; if (strcmp(cmd, "check_alive") == 0) return 0;
if (strcmp(cmd, "run_plan") == 0) return CommandRunPlan(argc, argv); if (strcmp(cmd, "run_plan") == 0) return CommandRunPlan(argc, argv);
if (strcmp(cmd, "gen_vs") == 0) return CommandGenVS(argc, argv);
printf("[ERROR] Unknown command: %s\n", cmd); printf("[ERROR] Unknown command: %s\n", cmd);
return 1; return 1;