diff --git a/External/Imgui b/External/Imgui index a9e7a8c..9b7699f 160000 --- a/External/Imgui +++ b/External/Imgui @@ -1 +1 @@ -Subproject commit a9e7a8c880cf4a7fbf142b13a41bcbb1f43d0938 +Subproject commit 9b7699f32597e7c7a799f22b1860ac586c2857b9 diff --git a/Juliet.sln b/Juliet.sln index 346b18a..c2f85ae 100644 --- a/Juliet.sln +++ b/Juliet.sln @@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "Game\Game.vcxproj", "{b568a67e-05a1-9907-ff4b-a129119528bd}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\imgui\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "Intermediate\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/JulietShaderCompiler.sln b/JulietShaderCompiler.sln index 5e58359..98cbde8 100644 --- a/JulietShaderCompiler.sln +++ b/JulietShaderCompiler.sln @@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JulietShaderCompiler", "Jul EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\imgui\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "Intermediate\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Romeo.sln b/Romeo.sln index 904c7b8..161ec26 100644 --- a/Romeo.sln +++ b/Romeo.sln @@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Romeo", "Romeo\Romeo.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\imgui\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "Intermediate\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/misc/Generate.bat b/misc/Generate.bat index f783f4b..ac0495f 100644 --- a/misc/Generate.bat +++ b/misc/Generate.bat @@ -31,22 +31,22 @@ if exist "%PLAN%" del /f /q "%PLAN%" >>"%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 PROJECT ImGui Intermediate >>"%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 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