diff --git a/.gitignore b/.gitignore index fce2e9f..8f3ff79 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ [Ll]ib/ .idea/ .vs/ +vs/ [Ii]ntermediate/ [sS]hip/ diff --git a/External/ImGui.vcxproj b/External/ImGui.vcxproj deleted file mode 100644 index 16c5094..0000000 --- a/External/ImGui.vcxproj +++ /dev/null @@ -1,202 +0,0 @@ - - - - - Debug - x64 - - - Profile - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {c16ffe36-6c94-4f93-bc2a-7f5284b7d434} - MakeFileProj - - - - Makefile - false - v143 - $(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe - - - Makefile - false - v143 - $(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe - - - Makefile - false - v143 - $(SolutionDir)\bin\x64-$(Configuration)\$(ProjectName).exe - - - - - - - - - - - - - - - - cd $(SolutionDir) & misc\build.bat $(Configuration) $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean $(Configuration) $(SolutionName) - $(SolutionDir)\bin\x64-$(Configuration)\ - $(SolutionDir)\Intermediate - $(SolutionDir)\bin - - - cd $(SolutionDir) & misc\build.bat $(Configuration) $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean $(Configuration) $(SolutionName) - $(SolutionDir)\bin\x64-$(Configuration)\ - $(SolutionDir)\Intermediate - $(SolutionDir)\bin - - - cd $(SolutionDir) & misc\build.bat $(Configuration) $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean $(Configuration) $(SolutionName) - $(SolutionDir)\bin\x64-$(Configuration)\ - $(SolutionDir)\Intermediate - $(SolutionDir)\bin - - - - $(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log - - - - - $(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log - - - - - $(SolutionDir)\Intermediate\$(ProjectName)-$(Configuration).log - - - - - - - - \ No newline at end of file diff --git a/External/ImGui.vcxproj.filters b/External/ImGui.vcxproj.filters deleted file mode 100644 index ab04358..0000000 --- a/External/ImGui.vcxproj.filters +++ /dev/null @@ -1,540 +0,0 @@ - - - - - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - backends - - - examples\example_allegro5 - - - examples\example_allegro5 - - - examples\example_android_opengl3 - - - examples\example_apple_metal4 - - - examples\example_apple_metal - - - examples\example_apple_opengl2 - - - examples\example_glfw_metal - - - examples\example_glfw_opengl2 - - - examples\example_glfw_opengl3 - - - examples\example_glfw_vulkan - - - examples\example_glfw_wgpu - - - examples\example_glut_opengl2 - - - examples\example_null - - - examples\example_sdl2_directx11 - - - examples\example_sdl2_metal - - - examples\example_sdl2_opengl2 - - - examples\example_sdl2_opengl3 - - - examples\example_sdl2_sdlrenderer2 - - - examples\example_sdl2_vulkan - - - examples\example_sdl2_wgpu - - - examples\example_sdl3_directx11 - - - examples\example_sdl3_metal4 - - - examples\example_sdl3_metal - - - examples\example_sdl3_opengl3 - - - examples\example_sdl3_sdlgpu3 - - - examples\example_sdl3_sdlrenderer3 - - - examples\example_sdl3_vulkan - - - examples\example_sdl3_wgpu - - - examples\example_win32_directx10 - - - examples\example_win32_directx11 - - - examples\example_win32_directx12 - - - examples\example_win32_directx9 - - - examples\example_win32_opengl3 - - - examples\example_win32_vulkan - - - examples\libs\emscripten - - - examples\libs\glfw\include\GLFW - - - examples\libs\glfw\include\GLFW - - - examples\libs\usynergy - - - examples\libs\usynergy - - - - - - - - - - - - - - - - - - - - - - - - - misc\cpp - - - misc\cpp - - - misc\debuggers - - - misc\fonts - - - misc\freetype - - - misc\freetype - - - misc\single_file - - - - - {76e0cd46-6c94-4f93-bc2a-7f5284b7d434} - - - - - {afb95218-6c94-4f93-bc2a-7f5284b7d434} - - - - - {1f18bf0c-6c94-4f93-bc2a-7f5284b7d434} - - - - - {e530954e-6c94-4f93-bc2a-7f5284b7d434} - - - - - {3cc03c55-6c94-4f93-bc2a-7f5284b7d434} - - - - - {16c31149-6c94-4f93-bc2a-7f5284b7d434} - - - - - {e40593b1-6c94-4f93-bc2a-7f5284b7d434} - - - - - {3f752825-6c94-4f93-bc2a-7f5284b7d434} - - - - - {c215e32a-6c94-4f93-bc2a-7f5284b7d434} - - - - - {615ff294-6c94-4f93-bc2a-7f5284b7d434} - - - - - {61582fc8-6c94-4f93-bc2a-7f5284b7d434} - - - - - {a31b119a-6c94-4f93-bc2a-7f5284b7d434} - - - - - {01ccd54d-6c94-4f93-bc2a-7f5284b7d434} - - - - - {f4c8b947-6c94-4f93-bc2a-7f5284b7d434} - - - - - {f2d77d32-6c94-4f93-bc2a-7f5284b7d434} - - - - - {776017f1-6c94-4f93-bc2a-7f5284b7d434} - - - - - {4d812b44-6c94-4f93-bc2a-7f5284b7d434} - - - - - {7be81d1f-6c94-4f93-bc2a-7f5284b7d434} - - - - - {e190514e-6c94-4f93-bc2a-7f5284b7d434} - - - - - {a2cc40a8-6c94-4f93-bc2a-7f5284b7d434} - - - - - {8777abc2-6c94-4f93-bc2a-7f5284b7d434} - - - - - {b9c33cde-6c94-4f93-bc2a-7f5284b7d434} - - - - - {754be038-6c94-4f93-bc2a-7f5284b7d434} - - - - - {4dc8b8c8-6c94-4f93-bc2a-7f5284b7d434} - - - - - {3b7dda38-6c94-4f93-bc2a-7f5284b7d434} - - - - - {2505aa94-6c94-4f93-bc2a-7f5284b7d434} - - - - - {da535992-6c94-4f93-bc2a-7f5284b7d434} - - - - - {bc5700b1-6c94-4f93-bc2a-7f5284b7d434} - - - - - {b3511882-6c94-4f93-bc2a-7f5284b7d434} - - - - - {ffdcc484-6c94-4f93-bc2a-7f5284b7d434} - - - - - {1ec285ef-6c94-4f93-bc2a-7f5284b7d434} - - - - - {9c32029b-6c94-4f93-bc2a-7f5284b7d434} - - - - - {c1caea97-6c94-4f93-bc2a-7f5284b7d434} - - - - - {b1ac1dca-6c94-4f93-bc2a-7f5284b7d434} - - - - - {81f39c9e-6c94-4f93-bc2a-7f5284b7d434} - - - - - {deff277e-6c94-4f93-bc2a-7f5284b7d434} - - - - - {4df04038-6c94-4f93-bc2a-7f5284b7d434} - - - - - {f6903215-6c94-4f93-bc2a-7f5284b7d434} - - - - - {114c63d2-6c94-4f93-bc2a-7f5284b7d434} - - - - - {012e170c-6c94-4f93-bc2a-7f5284b7d434} - - - - - {269d74cc-6c94-4f93-bc2a-7f5284b7d434} - - - - - {405959db-6c94-4f93-bc2a-7f5284b7d434} - - - - - {0496d0b7-6c94-4f93-bc2a-7f5284b7d434} - - - - - {68d63fa2-6c94-4f93-bc2a-7f5284b7d434} - - - - - {ae5b8b78-6c94-4f93-bc2a-7f5284b7d434} - - - - - {c72c0104-6c94-4f93-bc2a-7f5284b7d434} - - - - - {2ce20248-6c94-4f93-bc2a-7f5284b7d434} - - - \ No newline at end of file diff --git a/External/Imgui.bff b/External/Imgui.bff deleted file mode 100644 index 1ed6d0c..0000000 --- a/External/Imgui.bff +++ /dev/null @@ -1,24 +0,0 @@ -// ImGui -//------------------------------------------------------------------------------ -{ - .ProjectName = 'ImGui' - .ProjectPath = 'External/imgui' - - // Configurations - //-------------------------------------------------------------------------- - ForEach( .BuildConfigName in .BuildConfigs ) - { - #if __WINDOWS__ - .ProjectConfig = [ Using( .'Project_x64_$BuildConfigName$' ) ] - ^ProjectConfigs + .ProjectConfig - #endif - } - - VCXProject( '$ProjectName$' ) - { - .ProjectOutput = 'External/$ProjectName$.vcxproj' - .ProjectBasePath = '$ProjectPath$/' - .ProjectInputPaths = .ProjectBasePath - .ProjectConfigs = .ProjectConfigs - } -} diff --git a/Game/Game.bff b/Game/Game.bff deleted file mode 100644 index 11c4d6e..0000000 --- a/Game/Game.bff +++ /dev/null @@ -1,24 +0,0 @@ -// Game - Lib/Dll -//------------------------------------------------------------------------------ -{ - .ProjectName = 'Game' - .ProjectPath = 'Game' - - // Library Configurations - //-------------------------------------------------------------------------- - ForEach( .BuildConfigName in .BuildConfigs ) - { - #if __WINDOWS__ - .ProjectConfig = [ Using( .'Project_x64_$BuildConfigName$' ) ] - ^ProjectConfigs + .ProjectConfig - #endif - } - - VCXProject( '$ProjectName$' ) - { - .ProjectOutput = '$ProjectPath$/$ProjectName$.vcxproj' - .ProjectBasePath = '$ProjectPath$/' - .ProjectInputPaths = .ProjectBasePath - .ProjectConfigs = .ProjectConfigs - } -} \ No newline at end of file diff --git a/Game/Game.vcxproj b/Game/Game.vcxproj deleted file mode 100644 index 58a6527..0000000 --- a/Game/Game.vcxproj +++ /dev/null @@ -1,95 +0,0 @@ - - - - - Debug - x64 - - - Profile - x64 - - - Release - x64 - - - - {b568a67e-05a1-9907-ff4b-a129119528bd} - MakeFileProj - - - - Makefile - false - v143 - - - Makefile - false - v143 - - - Makefile - false - v143 - - - - - - cd $(SolutionDir) & misc\build.bat Debug $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Debug $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Debug $(SolutionName) - $(SolutionDir)bin\x64-Debug\Game.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;JULIET_EXPORT;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - $(SolutionDir)bin\x64-Debug\ - $(SolutionDir)Intermediate\x64-Debug\Game\ - $(SolutionDir)bin\x64-Debug\ - - - cd $(SolutionDir) & misc\build.bat Profile $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Profile $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Profile $(SolutionName) - $(SolutionDir)bin\x64-Profile\Game.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;JULIET_EXPORT;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - $(SolutionDir)bin\x64-Profile\ - $(SolutionDir)Intermediate\x64-Profile\Game\ - $(SolutionDir)bin\x64-Profile\ - - - cd $(SolutionDir) & misc\build.bat Release $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Release $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Release $(SolutionName) - $(SolutionDir)bin\x64-Release\Game.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;JULIET_EXPORT;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - $(SolutionDir)bin\x64-Release\ - $(SolutionDir)Intermediate\x64-Release\Game\ - $(SolutionDir)bin\x64-Release\ - - - - - - - - - - - - diff --git a/Game/Game.vcxproj.filters b/Game/Game.vcxproj.filters deleted file mode 100644 index 4902938..0000000 --- a/Game/Game.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - Entity - - - - Entity - - - Entity - - - - diff --git a/Juliet.sln b/Juliet.sln deleted file mode 100644 index c2f85ae..0000000 --- a/Juliet.sln +++ /dev/null @@ -1,39 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JulietApp", "JulietApp\JulietApp.vcxproj", "{1720427b-c8ba-3195-f931-e97f6d6125c1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "Game\Game.vcxproj", "{b568a67e-05a1-9907-ff4b-a129119528bd}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "Intermediate\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Profile|x64 = Profile|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1720427b-c8ba-3195-f931-e97f6d6125c1}.Debug|x64.ActiveCfg = Debug|x64 - {1720427b-c8ba-3195-f931-e97f6d6125c1}.Debug|x64.Build.0 = Debug|x64 - {1720427b-c8ba-3195-f931-e97f6d6125c1}.Profile|x64.ActiveCfg = Profile|x64 - {1720427b-c8ba-3195-f931-e97f6d6125c1}.Profile|x64.Build.0 = Profile|x64 - {1720427b-c8ba-3195-f931-e97f6d6125c1}.Release|x64.ActiveCfg = Release|x64 - {1720427b-c8ba-3195-f931-e97f6d6125c1}.Release|x64.Build.0 = Release|x64 - {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Debug|x64.ActiveCfg = Debug|x64 - {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Profile|x64.ActiveCfg = Profile|x64 - {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Release|x64.ActiveCfg = Release|x64 - {b568a67e-05a1-9907-ff4b-a129119528bd}.Debug|x64.ActiveCfg = Debug|x64 - {b568a67e-05a1-9907-ff4b-a129119528bd}.Profile|x64.ActiveCfg = Profile|x64 - {b568a67e-05a1-9907-ff4b-a129119528bd}.Release|x64.ActiveCfg = Release|x64 - {652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Debug|x64.ActiveCfg = Debug|x64 - {652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Profile|x64.ActiveCfg = Profile|x64 - {652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Juliet/Juliet.bff b/Juliet/Juliet.bff deleted file mode 100644 index 659be0f..0000000 --- a/Juliet/Juliet.bff +++ /dev/null @@ -1,24 +0,0 @@ -// Juliet - Lib -//------------------------------------------------------------------------------ -{ - .ProjectName = 'Juliet' - .ProjectPath = 'Juliet' - - // Library Configurations - //-------------------------------------------------------------------------- - ForEach( .BuildConfigName in .BuildConfigs ) - { - #if __WINDOWS__ - .ProjectConfig = [ Using( .'Project_x64_$BuildConfigName$' ) ] - ^ProjectConfigs + .ProjectConfig - #endif - } - - VCXProject( '$ProjectName$' ) - { - .ProjectOutput = '$ProjectPath$/$ProjectName$.vcxproj' - .ProjectBasePath = '$ProjectPath$/' - .ProjectInputPaths = .ProjectBasePath - .ProjectConfigs = .ProjectConfigs - } -} \ No newline at end of file diff --git a/JulietApp/JulietApp.bff b/JulietApp/JulietApp.bff deleted file mode 100644 index 2d0a155..0000000 --- a/JulietApp/JulietApp.bff +++ /dev/null @@ -1,27 +0,0 @@ -// JulietApp -//------------------------------------------------------------------------------ -{ - .ProjectName = 'JulietApp' - .ProjectPath = 'JulietApp' - - // Configurations - //-------------------------------------------------------------------------- - ForEach( .BuildConfigName in .BuildConfigs ) - { - #if __WINDOWS__ - .ProjectConfig = - [ - Using( .'Project_x64_$BuildConfigName$' ) - ] - ^ProjectConfigs + .ProjectConfig - #endif - } - - VCXProject( '$ProjectName$' ) - { - .ProjectOutput = '$ProjectPath$/$ProjectName$.vcxproj' - .ProjectBasePath = '$ProjectPath$/' - .ProjectInputPaths = .ProjectBasePath - .ProjectConfigs = .ProjectConfigs - } -} \ No newline at end of file diff --git a/JulietApp/JulietApp.vcxproj b/JulietApp/JulietApp.vcxproj deleted file mode 100644 index 2ec31c4..0000000 --- a/JulietApp/JulietApp.vcxproj +++ /dev/null @@ -1,92 +0,0 @@ - - - - - Debug - x64 - - - Profile - x64 - - - Release - x64 - - - - {1720427b-c8ba-3195-f931-e97f6d6125c1} - MakeFileProj - - - - Makefile - false - v143 - - - Makefile - false - v143 - - - Makefile - false - v143 - - - - - - cd $(SolutionDir) & misc\build.bat Debug $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Debug $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Debug $(SolutionName) - $(SolutionDir)bin\x64-Debug\JulietApp.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - $(SolutionDir)bin\x64-Debug\ - $(SolutionDir)Intermediate\x64-Debug\JulietApp\ - $(SolutionDir)bin\x64-Debug\ - - - cd $(SolutionDir) & misc\build.bat Profile $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Profile $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Profile $(SolutionName) - $(SolutionDir)bin\x64-Profile\JulietApp.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - $(SolutionDir)bin\x64-Profile\ - $(SolutionDir)Intermediate\x64-Profile\JulietApp\ - $(SolutionDir)bin\x64-Profile\ - - - cd $(SolutionDir) & misc\build.bat Release $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Release $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Release $(SolutionName) - $(SolutionDir)bin\x64-Release\JulietApp.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - $(SolutionDir)bin\x64-Release\ - $(SolutionDir)Intermediate\x64-Release\JulietApp\ - $(SolutionDir)bin\x64-Release\ - - - - - - - - - diff --git a/JulietApp/JulietApp.vcxproj.filters b/JulietApp/JulietApp.vcxproj.filters deleted file mode 100644 index d0d238b..0000000 --- a/JulietApp/JulietApp.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/JulietShaderCompiler.sln b/JulietShaderCompiler.sln deleted file mode 100644 index 98cbde8..0000000 --- a/JulietShaderCompiler.sln +++ /dev/null @@ -1,34 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JulietShaderCompiler", "JulietShaderCompiler\JulietShaderCompiler.vcxproj", "{c7df05fe-d5d5-db2a-af36-e7d71d325fda}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "Intermediate\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Profile|x64 = Profile|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Debug|x64.ActiveCfg = Debug|x64 - {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Debug|x64.Build.0 = Debug|x64 - {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Profile|x64.ActiveCfg = Profile|x64 - {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Profile|x64.Build.0 = Profile|x64 - {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Release|x64.ActiveCfg = Release|x64 - {c7df05fe-d5d5-db2a-af36-e7d71d325fda}.Release|x64.Build.0 = Release|x64 - {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Debug|x64.ActiveCfg = Debug|x64 - {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Profile|x64.ActiveCfg = Profile|x64 - {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Release|x64.ActiveCfg = Release|x64 - {652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Debug|x64.ActiveCfg = Debug|x64 - {652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Profile|x64.ActiveCfg = Profile|x64 - {652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/JulietShaderCompiler/JulietShaderCompiler.bff b/JulietShaderCompiler/JulietShaderCompiler.bff deleted file mode 100644 index 9d95c37..0000000 --- a/JulietShaderCompiler/JulietShaderCompiler.bff +++ /dev/null @@ -1,28 +0,0 @@ -// JulietShaderCompiler -//------------------------------------------------------------------------------ -{ - .ProjectName = 'JulietShaderCompiler' - .ProjectPath = 'JulietShaderCompiler' - - // Configurations - //-------------------------------------------------------------------------- - ForEach( .BuildConfigName in .BuildConfigs ) - { - #if __WINDOWS__ - .ConfigInfo = - [ - Using( .'Project_x64_$BuildConfigName$' ) - .LocalDebuggerCommandArguments = '..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil' - ] - ^ProjectConfigs + .ConfigInfo - #endif - } - - VCXProject( '$ProjectName$' ) - { - .ProjectOutput = '$ProjectPath$/$ProjectName$.vcxproj' - .ProjectBasePath = '$ProjectPath$/' - .ProjectInputPaths = { .ProjectBasePath } - .ProjectConfigs = .ProjectConfigs - } -} \ No newline at end of file diff --git a/JulietShaderCompiler/JulietShaderCompiler.vcxproj b/JulietShaderCompiler/JulietShaderCompiler.vcxproj deleted file mode 100644 index ece7eca..0000000 --- a/JulietShaderCompiler/JulietShaderCompiler.vcxproj +++ /dev/null @@ -1,97 +0,0 @@ - - - - - Debug - x64 - - - Profile - x64 - - - Release - x64 - - - - {c7df05fe-d5d5-db2a-af36-e7d71d325fda} - MakeFileProj - - - - Makefile - false - v143 - - - Makefile - false - v143 - - - Makefile - false - v143 - - - - - - cd $(SolutionDir) & misc\build.bat Debug $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Debug $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Debug $(SolutionName) - $(SolutionDir)bin\x64-Debug\JulietShaderCompiler.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - ..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil - $(SolutionDir)bin\x64-Debug\ - $(SolutionDir)Intermediate\x64-Debug\JulietShaderCompiler\ - $(SolutionDir)bin\x64-Debug\ - - - cd $(SolutionDir) & misc\build.bat Profile $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Profile $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Profile $(SolutionName) - $(SolutionDir)bin\x64-Profile\JulietShaderCompiler.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - ..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil - $(SolutionDir)bin\x64-Profile\ - $(SolutionDir)Intermediate\x64-Profile\JulietShaderCompiler\ - $(SolutionDir)bin\x64-Profile\ - - - cd $(SolutionDir) & misc\build.bat Release $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Release $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Release $(SolutionName) - $(SolutionDir)bin\x64-Release\JulietShaderCompiler.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - ..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil - $(SolutionDir)bin\x64-Release\ - $(SolutionDir)Intermediate\x64-Release\JulietShaderCompiler\ - $(SolutionDir)bin\x64-Release\ - - - - - - - - - - - diff --git a/JulietShaderCompiler/JulietShaderCompiler.vcxproj.filters b/JulietShaderCompiler/JulietShaderCompiler.vcxproj.filters deleted file mode 100644 index a2a2e11..0000000 --- a/JulietShaderCompiler/JulietShaderCompiler.vcxproj.filters +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - DXShaderCompiler - - - - diff --git a/Romeo.sln b/Romeo.sln deleted file mode 100644 index 161ec26..0000000 --- a/Romeo.sln +++ /dev/null @@ -1,34 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Romeo", "Romeo\Romeo.vcxproj", "{767620a7-b286-e7a1-9f79-3e14ce9e5ab1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "Intermediate\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Profile|x64 = Profile|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Debug|x64.ActiveCfg = Debug|x64 - {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Debug|x64.Build.0 = Debug|x64 - {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Profile|x64.ActiveCfg = Profile|x64 - {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Profile|x64.Build.0 = Profile|x64 - {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Release|x64.ActiveCfg = Release|x64 - {767620a7-b286-e7a1-9f79-3e14ce9e5ab1}.Release|x64.Build.0 = Release|x64 - {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Debug|x64.ActiveCfg = Debug|x64 - {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Profile|x64.ActiveCfg = Profile|x64 - {a93aa30f-8f29-02fe-57e2-cd3626948b68}.Release|x64.ActiveCfg = Release|x64 - {652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Debug|x64.ActiveCfg = Debug|x64 - {652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Profile|x64.ActiveCfg = Profile|x64 - {652d3fea-b417-1d5e-9f79-3f32e9604ddc}.Release|x64.ActiveCfg = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Romeo/Romeo.bff b/Romeo/Romeo.bff deleted file mode 100644 index 761efff..0000000 --- a/Romeo/Romeo.bff +++ /dev/null @@ -1,27 +0,0 @@ -// Romeo - Documentation Tool executable -//------------------------------------------------------------------------------ -{ - .ProjectName = 'Romeo' - .ProjectPath = 'Romeo' - - // Configurations - //-------------------------------------------------------------------------- - ForEach( .BuildConfigName in .BuildConfigs ) - { - #if __WINDOWS__ - .ProjectConfig = - [ - Using( .'Project_x64_$BuildConfigName$' ) - ] - ^ProjectConfigs + .ProjectConfig - #endif - } - - VCXProject( '$ProjectName$' ) - { - .ProjectOutput = '$ProjectPath$/$ProjectName$.vcxproj' - .ProjectBasePath = '$ProjectPath$/' - .ProjectInputPaths = .ProjectBasePath - .ProjectConfigs = .ProjectConfigs - } -} diff --git a/Romeo/Romeo.vcxproj b/Romeo/Romeo.vcxproj deleted file mode 100644 index 134a5d8..0000000 --- a/Romeo/Romeo.vcxproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - - Debug - x64 - - - Profile - x64 - - - Release - x64 - - - - {767620a7-b286-e7a1-9f79-3e14ce9e5ab1} - MakeFileProj - - - - Makefile - false - v143 - - - Makefile - false - v143 - - - Makefile - false - v143 - - - - - - cd $(SolutionDir) & misc\build.bat Debug $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Debug $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Debug $(SolutionName) - $(SolutionDir)bin\x64-Debug\Romeo.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - $(SolutionDir)bin\x64-Debug\ - $(SolutionDir)Intermediate\x64-Debug\Romeo\ - $(SolutionDir)bin\x64-Debug\ - - - cd $(SolutionDir) & misc\build.bat Profile $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Profile $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Profile $(SolutionName) - $(SolutionDir)bin\x64-Profile\Romeo.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - $(SolutionDir)bin\x64-Profile\ - $(SolutionDir)Intermediate\x64-Profile\Romeo\ - $(SolutionDir)bin\x64-Profile\ - - - cd $(SolutionDir) & misc\build.bat Release $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Release $(SolutionName) - cd $(SolutionDir) & misc\build.bat -clean Release $(SolutionName) - $(SolutionDir)bin\x64-Release\Romeo.exe - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath) - $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath) - Core/PCH.h;$(NMakeForcedIncludes) - JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;$(NMakePreprocessorDefinitions) - /std:c++20 - stdcpp20 - $(SolutionDir)bin\x64-Release\ - $(SolutionDir)Intermediate\x64-Release\Romeo\ - $(SolutionDir)bin\x64-Release\ - - - - - - - - - - - - - - - - - - diff --git a/fbuild.bff b/fbuild.bff deleted file mode 100644 index 64c5106..0000000 --- a/fbuild.bff +++ /dev/null @@ -1,105 +0,0 @@ -//------------------------------------------------------------------------------ -// Settings -//------------------------------------------------------------------------------ -Settings -{ - .CachePath = 'C:\FASTBuild_Cache\' // Use a local SSD or network path - #if __WINDOWS__ - #import TMP - .Environment = { "TMP=$TMP$", - "SystemRoot=C:\Windows" } - #endif -} - -//------------------------------------------------------------------------------ -// Global Output Paths -//------------------------------------------------------------------------------ -.BinPath = 'bin' -.OutputBase = 'Intermediate' -.CommonWinLibs = ' kernel32.lib user32.lib gdi32.lib dxguid.lib Ws2_32.lib dxgi.lib imm32.lib dwmapi.lib d3dcompiler.lib shell32.lib' - -//------------------------------------------------------------------------------ -// VisualStudio Project Generation -//------------------------------------------------------------------------------ -#if __WINDOWS__ - .ProjectCommon = - [ - .ProjectBuildCommand = 'cd ^$(SolutionDir) & misc\build.bat ^$(Configuration) ^$(SolutionName)' - .ProjectRebuildCommand = 'cd ^$(SolutionDir) & misc\build.bat -clean ^$(Configuration) ^$(SolutionName)' - .OutputDirectory = '^$(SolutionDir)\bin' - .IntermediateDirectory = '^$(SolutionDir)\Intermediate' - .BuildLogFile = '^$(SolutionDir)\Intermediate\^$(ProjectName)-^$(Configuration).log' - .Platform = 'x64' - .PlatformToolset = 'v143' - .LocalDebuggerCommand = '^$(SolutionDir)\bin\x64-^$(Configuration)\^$(ProjectName).exe' - .LocalDebuggerWorkingDirectory = '^$(SolutionDir)\bin\x64-^$(Configuration)\' - ] - - .Project_x64_Debug = [ Using( .ProjectCommon ) .SolutionPlatform = 'x64' .SolutionConfig = 'Debug' .Config = 'Debug' ] - .Project_x64_Profile = [ Using( .ProjectCommon ) .SolutionPlatform = 'x64' .SolutionConfig = 'Profile' .Config = 'Profile' ] - .Project_x64_Release = [ Using( .ProjectCommon ) .SolutionPlatform = 'x64' .SolutionConfig = 'Release' .Config = 'Release' ] -#endif - -// Configurations -//------------------------------------------------------------------------------ -.BuildConfigs = { 'Debug', 'Profile', 'Release' } - -// Include all projects to build -.ProjectConfigs = {} -#include "External/Imgui.bff" -.ProjectConfigs_ImGui = .ProjectConfigs - -.ProjectConfigs = {} -#include "Juliet/Juliet.bff" -.ProjectConfigs_Juliet = .ProjectConfigs - -.ProjectConfigs = {} -#include "Game/Game.bff" -.ProjectConfigs_Game = .ProjectConfigs - -.ProjectConfigs = {} -#include "JulietApp/JulietApp.Bff" -.ProjectConfigs_JulietApp = .ProjectConfigs - -.ProjectConfigs = {} -#include "JulietShaderCompiler/JulietShaderCompiler.Bff" -.ProjectConfigs_JulietShaderCompiler = .ProjectConfigs - -.ProjectConfigs = {} -#include "Romeo/Romeo.bff" -.ProjectConfigs_Romeo = .ProjectConfigs - - -// Generate solutions -VSSolution( 'JulietApp-Solution' ) -{ - .SolutionOutput = 'Juliet.sln' - .SolutionProjects = { 'JulietApp', 'Juliet', 'Game', 'ImGui' } - .SolutionConfigs = .ProjectConfigs_JulietApp - .SolutionBuildProject = 'JulietApp' -} - -VSSolution( 'Romeo-Solution' ) -{ - .SolutionOutput = 'Romeo.sln' - .SolutionProjects = { 'Romeo', 'Juliet', 'ImGui' } - .SolutionConfigs = .ProjectConfigs_Romeo - .SolutionBuildProject = 'Romeo' -} - -VSSolution( 'ShaderCompiler-Solution' ) -{ - .SolutionOutput = 'JulietShaderCompiler.sln' - .SolutionProjects = { 'JulietShaderCompiler', 'Juliet', 'ImGui' } - .SolutionConfigs = .ProjectConfigs_JulietShaderCompiler - .SolutionBuildProject = 'JulietShaderCompiler' -} - -Alias( 'gen' ) -{ - .Targets = { - 'JulietApp-Solution', - 'Romeo-Solution', - 'ShaderCompiler-Solution' - } -} diff --git a/tools/build_system.c b/tools/build_system.c index 6d75815..cd5366a 100644 --- a/tools/build_system.c +++ b/tools/build_system.c @@ -1124,9 +1124,9 @@ static void GenerateProject(const char* projectName, const char* projectDir, con } offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, - " $(SolutionDir)bin\\x64-%s\\\n" - " $(SolutionDir)Intermediate\\x64-%s\\%s\\\n" - " $(SolutionDir)bin\\x64-%s\\\n" + " $(SolutionDir)..\\bin\\x64-%s\\\n" + " $(SolutionDir)..\\Intermediate\\x64-%s\\%s\\\n" + " $(SolutionDir)..\\bin\\x64-%s\\\n" " \n", cfg, cfg, projectName, cfg); } @@ -1140,9 +1140,9 @@ static void GenerateProject(const char* projectName, const char* projectDir, con } if (EndsWithNoCase(path, ".cpp") || EndsWithNoCase(path, ".c")) { - offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, " \n", relPath); + offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, " \n", path); } else { - offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, " \n", relPath); + offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, " \n", path); } } offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, " \n"); @@ -1154,7 +1154,8 @@ static void GenerateProject(const char* projectName, const char* projectDir, con "\n"); char outPath[MAX_PATH_LEN]; - snprintf(outPath, sizeof(outPath), "%s\\%s.vcxproj", projectDir, projectName); + CreateDirectoryA("vs", NULL); + snprintf(outPath, sizeof(outPath), "vs\\%s.vcxproj", projectName); WriteEntireFile(outPath, buf, offset); printf("Generated %s\n", outPath); @@ -1239,19 +1240,19 @@ static void GenerateProject(const char* projectName, const char* projectDir, con dir[len] = '\0'; filterOffset += sprintf_s(filterBuf + filterOffset, (4 * 1024 * 1024) - filterOffset, - " <%s Include=\"%s\">\n" + " <%s Include=\"..\\%s\">\n" " %s\n" - " \n", type, relPath, dir, type); + " \n", type, path, dir, type); } else { filterOffset += sprintf_s(filterBuf + filterOffset, (4 * 1024 * 1024) - filterOffset, - " <%s Include=\"%s\" />\n", type, relPath); + " <%s Include=\"..\\%s\" />\n", type, path); } } filterOffset += sprintf_s(filterBuf + filterOffset, (4 * 1024 * 1024) - filterOffset, " \n\n"); char filterOutPath[MAX_PATH_LEN]; - snprintf(filterOutPath, sizeof(filterOutPath), "%s\\%s.vcxproj.filters", projectDir, projectName); + snprintf(filterOutPath, sizeof(filterOutPath), "vs\\%s.vcxproj.filters", projectName); WriteEntireFile(filterOutPath, filterBuf, filterOffset); printf("Generated %s\n", filterOutPath); } @@ -1269,8 +1270,8 @@ static void GenerateSolution(const char* slnName, const char** projectNames, con 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]); + "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"%s\", \"%s.vcxproj\", \"{%s}\"\n" + "EndProject\n", projectNames[i], projectNames[i], projectGuids[i]); } offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, @@ -1305,7 +1306,8 @@ static void GenerateSolution(const char* slnName, const char** projectNames, con "EndGlobal\n"); char outPath[MAX_PATH_LEN]; - snprintf(outPath, sizeof(outPath), "%s.sln", slnName); + CreateDirectoryA("vs", NULL); + snprintf(outPath, sizeof(outPath), "vs\\%s.sln", slnName); WriteEntireFile(outPath, buf, offset); printf("Generated %s\n", outPath); }