From 30654419898404039d5bb3951c2ed92d64828b8d Mon Sep 17 00:00:00 2001 From: Patedam Date: Tue, 4 Aug 2026 20:53:14 -0400 Subject: [PATCH] adaptive unity build --- misc/build.bat | 90 ++++++++++++--- tools/build_system.c | 257 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 296 insertions(+), 51 deletions(-) diff --git a/misc/build.bat b/misc/build.bat index 83b68a2..1fbc443 100644 --- a/misc/build.bat +++ b/misc/build.bat @@ -32,6 +32,12 @@ if /i "%~1"=="gen_vs" ( set GEN_VS_PLAN=%~2 goto do_compile_build_tool ) +if /i "%~1"=="clean" ( + echo [BUILD] Cleaning output directories... + if exist Intermediate rmdir /s /q Intermediate + if exist bin rmdir /s /q bin + exit /b 0 +) 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"=="profile" set CONFIG_PROFILE=1& set CONFIG_SPECIFIED=1 @@ -142,28 +148,33 @@ echo CONFIG !CFG!>>"!PLAN_FILE!" set UNITY_MAX_FILES=50 -echo UNITY Juliet Intermediate\Juliet Juliet_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" -if /i not "!CFG!"=="Release" echo UNITY_EXPLICIT Intermediate\External\imgui ImGui_Unity 1 External\imgui\imgui.cpp^|External\imgui\imgui_demo.cpp^|External\imgui\imgui_draw.cpp^|External\imgui\imgui_tables.cpp^|External\imgui\imgui_widgets.cpp^|External\imgui\backends\imgui_impl_win32.cpp^|External\imgui\backends\imgui_impl_dx12.cpp>>"!PLAN_FILE!" - -set ADD_GAME_UNITY=0 -if !TARGET_JULIET! equ 1 set ADD_GAME_UNITY=1 -if !TARGET_GAME! equ 1 set ADD_GAME_UNITY=1 - +if !TARGET_JULIET! equ 1 echo UNITY Juliet Intermediate\Juliet Juliet_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" if !TARGET_JULIET! equ 1 echo UNITY JulietApp Intermediate\JulietApp JulietApp_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" -if !ADD_GAME_UNITY! equ 1 echo UNITY Game Intermediate\Game Game_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" +if !TARGET_GAME! equ 1 echo UNITY Game Intermediate\Game Game_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" if !TARGET_ROMEO! equ 1 echo UNITY Romeo Intermediate\Romeo Romeo_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" if !TARGET_SHADER! equ 1 echo UNITY JulietShaderCompiler Intermediate\JulietShaderCompiler JulietShaderCompiler_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" -set COMMON_FLAGS=/nologo /std:c++20 /W4 /EHa- /utf-8 /DUNICODE /D_UNICODE /DWIN32_LEAN_AND_MEAN /D_CRT_SECURE_NO_WARNINGS /I"Juliet/include" /I"Juliet/src" /I"Game" /I"External/imgui" /I"External/imgui/backends" /DJULIET_WIN32 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 /wd4626 /wd5026 /wd5027 /wd4530 +if !TARGET_JULIET! equ 1 echo UNITY_EXPLICIT Intermediate\External\imgui ImGui_Unity !UNITY_MAX_FILES! External\imgui\imgui.cpp^|External\imgui\imgui_demo.cpp^|External\imgui\imgui_draw.cpp^|External\imgui\imgui_tables.cpp^|External\imgui\imgui_widgets.cpp^|External\imgui\backends\imgui_impl_win32.cpp^|External\imgui\backends\imgui_impl_dx12.cpp>>"!PLAN_FILE!" + +set COMMON_FLAGS=/nologo /std:c++20 /W4 /utf-8 /DUNICODE /D_UNICODE /DWIN32_LEAN_AND_MEAN /D_CRT_SECURE_NO_WARNINGS /I"Juliet/include" /I"Juliet/src" /I"Game" /I"External/imgui" /I"External/imgui/backends" /DJULIET_WIN32 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 /wd4626 /wd5026 /wd5027 /wd4530 + +set COMPILE_ONLY_FLAGS=/Bt+ /EHa- +echo !COMPILER! | findstr /i "clang-cl" >nul +if !errorlevel! equ 0 ( + set COMPILE_ONLY_FLAGS=!COMPILE_ONLY_FLAGS! -Wno-unused-command-line-argument +) if /i "!CFG!"=="Debug" ( - set COMPILER_FLAGS=!COMMON_FLAGS! /MDd /Od /Zi /Gw /Gy /Zc:inline /DDEBUG /DPROFILING_ENABLED /DJULIET_ENABLE_IMGUI /DJULIET_DEBUG + set COMPILER_FLAGS=!COMMON_FLAGS! !COMPILE_ONLY_FLAGS! /MDd /Od /Zi /Gw /Gy /Zc:inline /DDEBUG /DPROFILING_ENABLED /DJULIET_ENABLE_IMGUI /DJULIET_DEBUG + set LINK_FLAGS=!COMMON_FLAGS! /MDd /Od /Zi /Gw /Gy /Zc:inline /DDEBUG /DPROFILING_ENABLED /DJULIET_ENABLE_IMGUI /DJULIET_DEBUG set IMGUI_UNITY_SRCS=Intermediate\External\imgui\*.cpp ) else if /i "!CFG!"=="Profile" ( - set COMPILER_FLAGS=!COMMON_FLAGS! /MD /O2 /Zi /Gw /Gy /Zc:inline /DRELEASE /DPROFILING_ENABLED /DJULIET_ENABLE_IMGUI + set COMPILER_FLAGS=!COMMON_FLAGS! !COMPILE_ONLY_FLAGS! /MD /O2 /Zi /Gw /Gy /Zc:inline /DRELEASE /DPROFILING_ENABLED /DJULIET_ENABLE_IMGUI + set LINK_FLAGS=!COMMON_FLAGS! /MD /O2 /Zi /Gw /Gy /Zc:inline /DRELEASE /DPROFILING_ENABLED /DJULIET_ENABLE_IMGUI set IMGUI_UNITY_SRCS=Intermediate\External\imgui\*.cpp ) else ( - set COMPILER_FLAGS=!COMMON_FLAGS! /MD /O2 /Gw /Gy /Zc:inline /DRELEASE + set COMPILER_FLAGS=!COMMON_FLAGS! !COMPILE_ONLY_FLAGS! /MD /O2 /Gw /Gy /Zc:inline /DRELEASE + set LINK_FLAGS=!COMMON_FLAGS! /MD /O2 /Gw /Gy /Zc:inline /DRELEASE set IMGUI_UNITY_SRCS= ) @@ -189,11 +200,20 @@ echo OUTPUT Intermediate\x64-!CFG!\Juliet_PCH.obj>>"!PLAN_FILE!" echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!" echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllexport^) /DJULIET_EXPORT /Yc"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\Juliet.pch" /c Juliet\src\Core\PCH.cpp /Fo"Intermediate\x64-!CFG!\Juliet_PCH.obj">>"!PLAN_FILE!" +echo STEP Compiling Juliet Objs [!CFG!]>>"!PLAN_FILE!" +echo OUTPUT Intermediate\x64-!CFG!\Juliet_Objs>>"!PLAN_FILE!" +echo DEPENDS Juliet>>"!PLAN_FILE!" +echo INC_SRC Intermediate\Juliet>>"!PLAN_FILE!" +echo INC_OBJ Intermediate\x64-!CFG!\Juliet_Objs>>"!PLAN_FILE!" +echo COMMAND %COMPILER% %COMPILER_FLAGS% /MP /DIMGUI_API=__declspec^(dllexport^) /DJULIET_EXPORT /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\Juliet.pch" /c /Fo"Intermediate\x64-!CFG!\Juliet_Objs\\">>"!PLAN_FILE!" +set "JULIET_INPUTS=Intermediate\x64-!CFG!\Juliet_Objs\*.obj" +set "JULIET_LINK_CMD=!LINK_FLAGS!" + :: --- Juliet.dll --- echo STEP Building Juliet.dll [!CFG!]>>"!PLAN_FILE!" echo OUTPUT bin\x64-!CFG!\Juliet.dll>>"!PLAN_FILE!" echo DEPENDS Juliet^|External\imgui^|Intermediate\x64-!CFG!\Juliet_PCH.obj>>"!PLAN_FILE!" -echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllexport^) /DJULIET_EXPORT /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\Juliet.pch" /LD /Fe"bin\x64-!CFG!\Juliet.dll" Intermediate\Juliet\*.cpp Intermediate\x64-!CFG!\Juliet_PCH.obj %IMGUI_OBJS% /link %COMMON_LIBS% /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Juliet.ilk /PDB:Intermediate\x64-!CFG!\Juliet.pdb>>"!PLAN_FILE!" +echo COMMAND %COMPILER% !JULIET_LINK_CMD! /DIMGUI_API=__declspec^(dllexport^) /DJULIET_EXPORT /LD /Fe"bin\x64-!CFG!\Juliet.dll" !JULIET_INPUTS! Intermediate\x64-!CFG!\Juliet_PCH.obj %IMGUI_OBJS% /link %COMMON_LIBS% /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Juliet.ilk /PDB:Intermediate\x64-!CFG!\Juliet.pdb>>"!PLAN_FILE!" :: --- Game.dll --- if !BUILD_GAME_DLL! equ 1 ( @@ -206,10 +226,19 @@ if !BUILD_GAME_DLL! equ 1 ( echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!" echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /DJULIET_EXPORT /Yc"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\!GAME_DLL_NAME!.pch" /c Juliet\src\Core\PCH.cpp /Fo"Intermediate\x64-!CFG!\!GAME_DLL_NAME!_PCH.obj">>"!PLAN_FILE!" + echo STEP Compiling !GAME_DLL_NAME! Objs [!CFG!]>>"!PLAN_FILE!" + echo OUTPUT Intermediate\x64-!CFG!\!GAME_DLL_NAME!_Objs>>"!PLAN_FILE!" + echo DEPENDS Game>>"!PLAN_FILE!" + echo INC_SRC Intermediate\Game>>"!PLAN_FILE!" + echo INC_OBJ Intermediate\x64-!CFG!\!GAME_DLL_NAME!_Objs>>"!PLAN_FILE!" + echo COMMAND %COMPILER% %COMPILER_FLAGS% /MP /DIMGUI_API=__declspec^(dllimport^) /DJULIET_EXPORT /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\!GAME_DLL_NAME!.pch" /c /Fo"Intermediate\x64-!CFG!\!GAME_DLL_NAME!_Objs\\">>"!PLAN_FILE!" + set "GAME_INPUTS=Intermediate\x64-!CFG!\!GAME_DLL_NAME!_Objs\*.obj" + set "GAME_LINK_CMD=!LINK_FLAGS!" + 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^|Intermediate\x64-!CFG!\!GAME_DLL_NAME!_PCH.obj>>"!PLAN_FILE!" - echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /DJULIET_EXPORT /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\!GAME_DLL_NAME!.pch" /LD /Fe"bin\x64-!CFG!\!GAME_DLL_NAME!.dll" Intermediate\Game\*.cpp Intermediate\x64-!CFG!\!GAME_DLL_NAME!_PCH.obj /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!" + echo COMMAND %COMPILER% !GAME_LINK_CMD! /DIMGUI_API=__declspec^(dllimport^) /DJULIET_EXPORT /LD /Fe"bin\x64-!CFG!\!GAME_DLL_NAME!.dll" !GAME_INPUTS! Intermediate\x64-!CFG!\!GAME_DLL_NAME!_PCH.obj /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 --- @@ -220,10 +249,19 @@ if !TARGET_JULIET! equ 1 ( echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!" echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /Yc"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\JulietApp.pch" /c Juliet\src\Core\PCH.cpp /Fo"Intermediate\x64-!CFG!\JulietApp_PCH.obj">>"!PLAN_FILE!" + echo STEP Compiling JulietApp Objs [!CFG!]>>"!PLAN_FILE!" + echo OUTPUT Intermediate\x64-!CFG!\JulietApp_Objs>>"!PLAN_FILE!" + echo DEPENDS JulietApp>>"!PLAN_FILE!" + echo INC_SRC Intermediate\JulietApp>>"!PLAN_FILE!" + echo INC_OBJ Intermediate\x64-!CFG!\JulietApp_Objs>>"!PLAN_FILE!" + echo COMMAND %COMPILER% %COMPILER_FLAGS% /MP /DIMGUI_API=__declspec^(dllimport^) /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\JulietApp.pch" /c /Fo"Intermediate\x64-!CFG!\JulietApp_Objs\\">>"!PLAN_FILE!" + set "APP_INPUTS=Intermediate\x64-!CFG!\JulietApp_Objs\*.obj" + set "APP_LINK_CMD=!LINK_FLAGS!" + echo STEP Building JulietApp.exe [!CFG!]>>"!PLAN_FILE!" echo OUTPUT bin\x64-!CFG!\JulietApp.exe>>"!PLAN_FILE!" echo DEPENDS JulietApp^|Game^|Juliet^|External\imgui^|Intermediate\x64-!CFG!\JulietApp_PCH.obj>>"!PLAN_FILE!" - echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\JulietApp.pch" /Fe"bin\x64-!CFG!\JulietApp.exe" Intermediate\JulietApp\*.cpp Intermediate\x64-!CFG!\JulietApp_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietApp.ilk /PDB:Intermediate\x64-!CFG!\JulietApp.pdb>>"!PLAN_FILE!" + echo COMMAND %COMPILER% !APP_LINK_CMD! /DIMGUI_API=__declspec^(dllimport^) /Fe"bin\x64-!CFG!\JulietApp.exe" !APP_INPUTS! Intermediate\x64-!CFG!\JulietApp_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietApp.ilk /PDB:Intermediate\x64-!CFG!\JulietApp.pdb>>"!PLAN_FILE!" ) :: --- Romeo.exe --- @@ -234,10 +272,19 @@ if !TARGET_ROMEO! equ 1 ( echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!" echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /Yc"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\Romeo.pch" /c Juliet\src\Core\PCH.cpp /Fo"Intermediate\x64-!CFG!\Romeo_PCH.obj">>"!PLAN_FILE!" + echo STEP Compiling Romeo Objs [!CFG!]>>"!PLAN_FILE!" + echo OUTPUT Intermediate\x64-!CFG!\Romeo_Objs>>"!PLAN_FILE!" + echo DEPENDS Romeo>>"!PLAN_FILE!" + echo INC_SRC Intermediate\Romeo>>"!PLAN_FILE!" + echo INC_OBJ Intermediate\x64-!CFG!\Romeo_Objs>>"!PLAN_FILE!" + echo COMMAND %COMPILER% %COMPILER_FLAGS% /MP /DIMGUI_API=__declspec^(dllimport^) /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\Romeo.pch" /c /Fo"Intermediate\x64-!CFG!\Romeo_Objs\\">>"!PLAN_FILE!" + set "ROMEO_INPUTS=Intermediate\x64-!CFG!\Romeo_Objs\*.obj" + set "ROMEO_LINK_CMD=!LINK_FLAGS!" + echo STEP Building Romeo.exe [!CFG!]>>"!PLAN_FILE!" echo OUTPUT bin\x64-!CFG!\Romeo.exe>>"!PLAN_FILE!" echo DEPENDS Romeo^|Juliet^|External\imgui^|Intermediate\x64-!CFG!\Romeo_PCH.obj>>"!PLAN_FILE!" - echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\Romeo.pch" /Fe"bin\x64-!CFG!\Romeo.exe" Intermediate\Romeo\*.cpp Intermediate\x64-!CFG!\Romeo_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Romeo.ilk /PDB:Intermediate\x64-!CFG!\Romeo.pdb>>"!PLAN_FILE!" + echo COMMAND %COMPILER% !ROMEO_LINK_CMD! /DIMGUI_API=__declspec^(dllimport^) /Fe"bin\x64-!CFG!\Romeo.exe" !ROMEO_INPUTS! Intermediate\x64-!CFG!\Romeo_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Romeo.ilk /PDB:Intermediate\x64-!CFG!\Romeo.pdb>>"!PLAN_FILE!" ) :: --- JulietShaderCompiler.exe --- @@ -248,10 +295,19 @@ if !TARGET_SHADER! equ 1 ( echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!" echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /IJulietShaderCompiler /Yc"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\JulietShaderCompiler.pch" /c Juliet\src\Core\PCH.cpp /Fo"Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj">>"!PLAN_FILE!" + echo STEP Compiling JulietShaderCompiler Objs [!CFG!]>>"!PLAN_FILE!" + echo OUTPUT Intermediate\x64-!CFG!\JulietShaderCompiler_Objs>>"!PLAN_FILE!" + echo DEPENDS JulietShaderCompiler>>"!PLAN_FILE!" + echo INC_SRC Intermediate\JulietShaderCompiler>>"!PLAN_FILE!" + echo INC_OBJ Intermediate\x64-!CFG!\JulietShaderCompiler_Objs>>"!PLAN_FILE!" + echo COMMAND %COMPILER% %COMPILER_FLAGS% /MP /DIMGUI_API=__declspec^(dllimport^) /IJulietShaderCompiler /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\JulietShaderCompiler.pch" /c /Fo"Intermediate\x64-!CFG!\JulietShaderCompiler_Objs\\">>"!PLAN_FILE!" + set "SHADER_INPUTS=Intermediate\x64-!CFG!\JulietShaderCompiler_Objs\*.obj" + set "SHADER_LINK_CMD=!LINK_FLAGS! /IJulietShaderCompiler" + echo STEP Building JulietShaderCompiler.exe [!CFG!]>>"!PLAN_FILE!" echo OUTPUT bin\x64-!CFG!\JulietShaderCompiler.exe>>"!PLAN_FILE!" echo DEPENDS JulietShaderCompiler^|Juliet^|External\imgui^|Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj>>"!PLAN_FILE!" - echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /IJulietShaderCompiler /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\JulietShaderCompiler.pch" /Fe"bin\x64-!CFG!\JulietShaderCompiler.exe" Intermediate\JulietShaderCompiler\*.cpp Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietShaderCompiler.ilk /PDB:Intermediate\x64-!CFG!\JulietShaderCompiler.pdb>>"!PLAN_FILE!" + echo COMMAND %COMPILER% !SHADER_LINK_CMD! /DIMGUI_API=__declspec^(dllimport^) /Fe"bin\x64-!CFG!\JulietShaderCompiler.exe" !SHADER_INPUTS! Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietShaderCompiler.ilk /PDB:Intermediate\x64-!CFG!\JulietShaderCompiler.pdb>>"!PLAN_FILE!" ) exit /b 0 diff --git a/tools/build_system.c b/tools/build_system.c index 6b309d3..6d75815 100644 --- a/tools/build_system.c +++ b/tools/build_system.c @@ -301,56 +301,120 @@ static bool GenerateUnityFiles(const UnityConfig* ucfg) EnsureDirectoryExists(ucfg->OutputDir); - int fileIdx = 0; - int unityCount = 1; - char currentUnityPath[MAX_PATH_LEN]; - bool anyChanged = false; - - char* memBuf = (char*)ArenaPush(1024 * 1024); - int memOffset = 0; + SYSTEMTIME st; + GetSystemTime(&st); + FILETIME ftNow; + SystemTimeToFileTime(&st, &ftNow); + ULARGE_INTEGER liNow; + liNow.LowPart = ftNow.dwLowDateTime; + liNow.HighPart = ftNow.dwHighDateTime; + int64_t nowTime = liNow.QuadPart; + int64_t oneHour = 3600LL * 10000000LL; + + FilePathList* coldFiles = CreateFilePathList(); + FilePathList* hotFiles = CreateFilePathList(); for (int i = 0; i < srcFiles->Count; i++) { if (StringContains(srcFiles->Paths[i], "_Unity")) continue; - - if (fileIdx == 0) - { - memOffset = 0; + int64_t fileTime = GetFileModTimeInt64(srcFiles->Paths[i]); + if (nowTime - fileTime < oneHour) { + FilePathListAdd(hotFiles, srcFiles->Paths[i]); + } else { + FilePathListAdd(coldFiles, srcFiles->Paths[i]); } + } + int unityCount = 1; + bool anyChanged = false; + char currentUnityPath[MAX_PATH_LEN]; + char* memBuf = (char*)ArenaPush(1024 * 1024); + + // Process cold files (MaxFiles) + int fileIdx = 0; + int memOffset = 0; + int64_t maxIncludedTime = 0; + + for (int i = 0; i < coldFiles->Count; i++) + { char absPath[MAX_PATH_LEN]; - GetFullPathNameA(srcFiles->Paths[i], MAX_PATH_LEN, absPath, NULL); - for (int k = 0; absPath[k]; k++) { - if (absPath[k] == '\\') absPath[k] = '/'; - } + GetFullPathNameA(coldFiles->Paths[i], MAX_PATH_LEN, absPath, NULL); + for (int k = 0; absPath[k]; k++) { if (absPath[k] == '\\') absPath[k] = '/'; } memOffset += sprintf_s(memBuf + memOffset, (1024 * 1024) - memOffset, "#include \"%s\"\n", absPath); fileIdx++; + + int64_t fileTime = GetFileModTimeInt64(coldFiles->Paths[i]); + if (fileTime > maxIncludedTime) maxIncludedTime = fileTime; - if (fileIdx >= ucfg->MaxFiles || i == srcFiles->Count - 1) + if (fileIdx >= ucfg->MaxFiles || i == coldFiles->Count - 1) { snprintf(currentUnityPath, sizeof(currentUnityPath), "%s\\%s%d.cpp", ucfg->OutputDir, ucfg->Prefix, unityCount); - FileContent exist = ReadEntireFile(currentUnityPath); bool write = true; - if (exist.Data && exist.Size == memOffset) - { - if (memcmp(exist.Data, memBuf, memOffset) == 0) - { - write = false; + if (exist.Data && exist.Size == memOffset && memcmp(exist.Data, memBuf, memOffset) == 0) write = false; + if (write) { WriteEntireFile(currentUnityPath, memBuf, memOffset); anyChanged = true; } + + // Touch Unity file if included files are newer + if (!write) { + int64_t unityTime = GetFileModTimeInt64(currentUnityPath); + if (maxIncludedTime > unityTime) { + HANDLE hFile = CreateFileA(currentUnityPath, FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile != INVALID_HANDLE_VALUE) { + FILETIME ft; + ULARGE_INTEGER li; + li.QuadPart = nowTime; + ft.dwLowDateTime = li.LowPart; + ft.dwHighDateTime = li.HighPart; + SetFileTime(hFile, NULL, NULL, &ft); + CloseHandle(hFile); + } } } - if (write) - { - WriteEntireFile(currentUnityPath, memBuf, memOffset); - anyChanged = true; - } - + unityCount++; fileIdx = 0; + memOffset = 0; + maxIncludedTime = 0; } } - + + // Process hot files (Standalone) + for (int i = 0; i < hotFiles->Count; i++) + { + char absPath[MAX_PATH_LEN]; + GetFullPathNameA(hotFiles->Paths[i], MAX_PATH_LEN, absPath, NULL); + for (int k = 0; absPath[k]; k++) { if (absPath[k] == '\\') absPath[k] = '/'; } + + memOffset = sprintf_s(memBuf, (1024 * 1024), "#include \"%s\"\n", absPath); + + snprintf(currentUnityPath, sizeof(currentUnityPath), "%s\\%s%d.cpp", ucfg->OutputDir, ucfg->Prefix, unityCount); + FileContent exist = ReadEntireFile(currentUnityPath); + bool write = true; + if (exist.Data && exist.Size == memOffset && memcmp(exist.Data, memBuf, memOffset) == 0) write = false; + if (write) { WriteEntireFile(currentUnityPath, memBuf, memOffset); anyChanged = true; } + + if (!write) { + int64_t fileTime = GetFileModTimeInt64(hotFiles->Paths[i]); + int64_t unityTime = GetFileModTimeInt64(currentUnityPath); + if (fileTime > unityTime) { + HANDLE hFile = CreateFileA(currentUnityPath, FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile != INVALID_HANDLE_VALUE) { + FILETIME ft; + ULARGE_INTEGER li; + li.QuadPart = nowTime; + ft.dwLowDateTime = li.LowPart; + ft.dwHighDateTime = li.HighPart; + SetFileTime(hFile, NULL, NULL, &ft); + CloseHandle(hFile); + } + } + } + + unityCount++; + } + + // Delete remaining old unity files while (true) { snprintf(currentUnityPath, sizeof(currentUnityPath), "%s\\%s%d.cpp", ucfg->OutputDir, ucfg->Prefix, unityCount); @@ -360,10 +424,7 @@ static bool GenerateUnityFiles(const UnityConfig* ucfg) anyChanged = true; unityCount++; } - else - { - break; - } + else break; } return anyChanged; @@ -376,9 +437,11 @@ static bool GenerateUnityFiles(const UnityConfig* ucfg) typedef struct { char StepName[256]; - char OutputFile[MAX_PATH_LEN]; + char OutputFile[256]; char Depends[MAX_PATH_LEN]; char Command[MAX_FILES]; + char IncSrc[256]; + char IncObj[256]; } BuildStep; typedef struct @@ -449,6 +512,99 @@ static void AppendTiming(const char* stepName, double secs) g_TimingsLen += sprintf_s(g_TimingsBuf + g_TimingsLen, sizeof(g_TimingsBuf) - g_TimingsLen, "%s|%.3fs\n", stepName, secs); } +static int ExecuteIncrementalCompile(const char* srcDir, const char* objDir, const char* baseCmd) +{ + EnsureDirectoryExists(objDir); + + FilePathList* cppFiles = CreateFilePathList(); + CollectFiles(srcDir, NULL, ".cpp", cppFiles); + CollectFiles(srcDir, NULL, ".c", cppFiles); + + // Clean up stale .obj files + char objSearchPath[MAX_PATH_LEN]; + snprintf(objSearchPath, sizeof(objSearchPath), "%s\\*.obj", objDir); + WIN32_FIND_DATAA findData; + HANDLE hFind = FindFirstFileA(objSearchPath, &findData); + if (hFind != INVALID_HANDLE_VALUE) { + do { + if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + + char baseName[256]; + strcpy_s(baseName, sizeof(baseName), findData.cFileName); + char* ext = strrchr(baseName, '.'); + if (ext) *ext = '\0'; + + bool foundSrc = false; + for (int i = 0; i < cppFiles->Count; i++) { + const char* srcPath = cppFiles->Paths[i]; + const char* srcFile = strrchr(srcPath, '\\'); + if (!srcFile) srcFile = strrchr(srcPath, '/'); + if (!srcFile) srcFile = srcPath; else srcFile++; + + char srcBase[256]; + strcpy_s(srcBase, sizeof(srcBase), srcFile); + char* srcExt = strrchr(srcBase, '.'); + if (srcExt) *srcExt = '\0'; + + if (_stricmp(baseName, srcBase) == 0) { + foundSrc = true; + break; + } + } + + if (!foundSrc) { + char fullObjPath[MAX_PATH_LEN]; + snprintf(fullObjPath, sizeof(fullObjPath), "%s\\%s", objDir, findData.cFileName); + DeleteFileA(fullObjPath); + } + } while (FindNextFileA(hFind, &findData)); + FindClose(hFind); + } + + char* dirtyFiles = (char*)ArenaPush(MAX_FILES); + int dirtyCount = 0; + dirtyFiles[0] = '\0'; + + for (int i = 0; i < cppFiles->Count; i++) + { + const char* srcPath = cppFiles->Paths[i]; + const char* fileName = strrchr(srcPath, '\\'); + if (!fileName) fileName = strrchr(srcPath, '/'); + if (!fileName) fileName = srcPath; else fileName++; + + char objPath[MAX_PATH_LEN]; + sprintf_s(objPath, sizeof(objPath), "%s\\%s", objDir, fileName); + char* ext = strrchr(objPath, '.'); + if (ext) strcpy_s(ext, sizeof(objPath) - (ext - objPath), ".obj"); + + bool dirty = false; + if (!FileExists(objPath)) { + dirty = true; + } else { + if (GetFileModTimeInt64(srcPath) > GetFileModTimeInt64(objPath)) { + dirty = true; + } + } + + if (dirty) { + if (dirtyCount > 0) strcat_s(dirtyFiles, MAX_FILES, " "); + strcat_s(dirtyFiles, MAX_FILES, srcPath); + dirtyCount++; + } + } + + if (dirtyCount == 0) { + printf("[SKIP / UP-TO-DATE] %s [All objects up to date]\n", objDir); + return 0; + } + + printf("[REBUILDING] Compiling %d dirty file(s) in %s...\n", dirtyCount, srcDir); + char* fullCmd = (char*)ArenaPush(MAX_FILES * 2); + sprintf_s(fullCmd, MAX_FILES * 2, "%s %s", baseCmd, dirtyFiles); + + return ExecuteCmd(fullCmd); +} + static int CommandRunPlan(int argc, char* argv[]) { if (argc < 3) @@ -597,6 +753,22 @@ static int CommandRunPlan(int argc, char* argv[]) memcpy(curCfg->Steps[curCfg->StepCount - 1].Command, lineStart + 8, nLen); curCfg->Steps[curCfg->StepCount - 1].Command[nLen] = '\0'; } + else if (lineLen > 8 && memcmp(lineStart, "INC_SRC ", 8) == 0 && curCfg->StepCount > 0) + { + int nLen = lineLen - 8; + if (nLen >= (int)sizeof(curCfg->Steps[curCfg->StepCount - 1].IncSrc)) + nLen = (int)sizeof(curCfg->Steps[curCfg->StepCount - 1].IncSrc) - 1; + memcpy(curCfg->Steps[curCfg->StepCount - 1].IncSrc, lineStart + 8, nLen); + curCfg->Steps[curCfg->StepCount - 1].IncSrc[nLen] = '\0'; + } + else if (lineLen > 8 && memcmp(lineStart, "INC_OBJ ", 8) == 0 && curCfg->StepCount > 0) + { + int nLen = lineLen - 8; + if (nLen >= (int)sizeof(curCfg->Steps[curCfg->StepCount - 1].IncObj)) + nLen = (int)sizeof(curCfg->Steps[curCfg->StepCount - 1].IncObj) - 1; + memcpy(curCfg->Steps[curCfg->StepCount - 1].IncObj, lineStart + 8, nLen); + curCfg->Steps[curCfg->StepCount - 1].IncObj[nLen] = '\0'; + } } } while (*pos == '\n' || *pos == '\r') @@ -693,6 +865,23 @@ static int CommandRunPlan(int argc, char* argv[]) } printf("\n--- %s ---\n", step->StepName); + + if (step->IncSrc[0] != '\0' && step->IncObj[0] != '\0') + { + LARGE_INTEGER tStart, tEnd; + QueryPerformanceCounter(&tStart); + int res = ExecuteIncrementalCompile(step->IncSrc, step->IncObj, step->Command); + QueryPerformanceCounter(&tEnd); + AppendTiming(step->StepName, (double)(tEnd.QuadPart - tStart.QuadPart) / (double)perfFreq.QuadPart); + if (res != 0) { + printf("[BUILD FAILED] Command failed with exit code %d.\n", res); + return res; + } + anyNeedBuild = true; + anyBuilt = true; + continue; + } + if (!needCompile) { printf("[SKIP / UP-TO-DATE] %s [Binary up to date]\n", step->OutputFile);