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

no need to use juliet obj everywhere, compile the dll directly

Browse Source
This commit is contained in:
Patedam
2026-07-23 16:07:03 -04:00
parent cf75bf2dc7
commit 6afd675846
2 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
misc/build.bat
+16 -18
View File
@@ -205,7 +205,7 @@ echo ===========================================================================
if not exist "bin\x64-!CFG!" mkdir "bin\x64-!CFG!" if not exist "bin\x64-!CFG!" mkdir "bin\x64-!CFG!"
if not exist "Intermediate\x64-!CFG!" mkdir "Intermediate\x64-!CFG!" if not exist "Intermediate\x64-!CFG!" mkdir "Intermediate\x64-!CFG!"
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 /Fd"Intermediate\x64-!CFG!\vc140.pdb" 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 /i "!CFG!"=="Debug" ( 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! /MDd /Od /Zi /Gw /Gy /Zc:inline /DDEBUG /DPROFILING_ENABLED /DJULIET_ENABLE_IMGUI /DJULIET_DEBUG
@@ -223,16 +223,16 @@ set COMMON_LIBS=kernel32.lib user32.lib gdi32.lib dxguid.lib Ws2_32.lib dxgi.lib
:: --- Juliet Shared Objs --- :: --- Juliet Shared Objs ---
echo. echo.
echo --- Compiling Shared Object Files (Juliet / ImGui) [%CFG%] --- echo --- Compiling Shared Object Files (Juliet / ImGui) [%CFG%] ---
if !JULIET_NEED_COMPILE! equ 0 ( :: if !JULIET_NEED_COMPILE! equ 0 (
echo [SKIP / UP-TO-DATE] Intermediate\x64-!CFG!\Juliet_Unity*.obj [Unity files unchanged] :: echo [SKIP / UP-TO-DATE] Intermediate\x64-!CFG!\Juliet_Unity*.obj [Unity files unchanged]
) else ( :: ) else (
echo [REBUILDING] Compiling Intermediate\x64-!CFG!\Juliet_Unity*.obj... :: echo [REBUILDING] Compiling Intermediate\x64-!CFG!\Juliet_Unity*.obj...
"%CHECK_TOOL%" start_step "Compiling Juliet Shared Objs [!CFG!]" :: "%CHECK_TOOL%" start_step "Compiling Juliet Shared Objs [!CFG!]"
%COMPILER% %COMPILER_FLAGS% /DJULIET_EXPORT /c Intermediate\Juliet\*.cpp /Fo"Intermediate\x64-!CFG!\\" :: %COMPILER% %COMPILER_FLAGS% /DJULIET_EXPORT /c Intermediate\Juliet\*.cpp /Fo"Intermediate\x64-!CFG!\\"
set "COMP_ERR=!ERRORLEVEL!" :: set "COMP_ERR=!ERRORLEVEL!"
"%CHECK_TOOL%" end_step :: "%CHECK_TOOL%" end_step
if !COMP_ERR! neq 0 exit /b !COMP_ERR! :: if !COMP_ERR! neq 0 exit /b !COMP_ERR!
) :: )
:: --- ImGui Shared Objs --- :: --- ImGui Shared Objs ---
if defined IMGUI_UNITY_SRCS ( if defined IMGUI_UNITY_SRCS (
@@ -257,33 +257,31 @@ if !TARGET_JULIET! equ 1 set BUILD_GAME_DLL=1
if !TARGET_GAME! equ 1 set BUILD_GAME_DLL=1 if !TARGET_GAME! equ 1 set BUILD_GAME_DLL=1
:: --- Juliet.dll --- :: --- Juliet.dll ---
if !TARGET_JULIET! equ 1 ( call :link_target "Juliet.dll" "Building Juliet.dll [!CFG!]" "!JULIET_NEED_COMPILE!" "%COMPILER_FLAGS% /DJULIET_EXPORT /LD" "Intermediate\Juliet\*.cpp %IMGUI_OBJS%" "/link %COMMON_LIBS% /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Juliet.ilk /PDB:Intermediate\x64-!CFG!\Juliet.pdb"
call :link_target "Juliet.dll" "Building Juliet.dll [!CFG!]" "!JULIET_NEED_COMPILE!" "%COMPILER_FLAGS% /DJULIET_EXPORT /LD" "%JULIET_OBJS% %IMGUI_OBJS%" "/link %COMMON_LIBS% /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Juliet.ilk /PDB:Intermediate\x64-!CFG!\Juliet.pdb"
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
)
:: --- Game.dll --- :: --- Game.dll ---
if !BUILD_GAME_DLL! equ 1 ( if !BUILD_GAME_DLL! equ 1 (
call :link_target "Game.dll" "Building Game.dll [!CFG!]" "!GAME_NEED_COMPILE!" "%COMPILER_FLAGS% /DJULIET_EXPORT /LD" "Intermediate\Game\*.cpp %JULIET_OBJS% %IMGUI_OBJS%" "/link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Game.ilk /PDB:Intermediate\x64-!CFG!\Game.pdb" call :link_target "Game.dll" "Building Game.dll [!CFG!]" "!GAME_NEED_COMPILE!" "%COMPILER_FLAGS% /DJULIET_EXPORT /LD" "Intermediate\Game\*.cpp %IMGUI_OBJS%" "/link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Game.ilk /PDB:Intermediate\x64-!CFG!\Game.pdb"
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
) )
:: --- JulietApp.exe --- :: --- JulietApp.exe ---
if !TARGET_JULIET! equ 1 ( if !TARGET_JULIET! equ 1 (
call :link_target "JulietApp.exe" "Building JulietApp.exe [!CFG!]" "!JULIETAPP_NEED_COMPILE!" "%COMPILER_FLAGS%" "Intermediate\JulietApp\*.cpp %JULIET_OBJS% %IMGUI_OBJS%" "/link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietApp.ilk /PDB:Intermediate\x64-!CFG!\JulietApp.pdb" call :link_target "JulietApp.exe" "Building JulietApp.exe [!CFG!]" "!JULIETAPP_NEED_COMPILE!" "%COMPILER_FLAGS%" "Intermediate\JulietApp\*.cpp %IMGUI_OBJS%" "/link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietApp.ilk /PDB:Intermediate\x64-!CFG!\JulietApp.pdb"
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
) )
:: --- Romeo.exe --- :: --- Romeo.exe ---
if !TARGET_ROMEO! equ 1 ( if !TARGET_ROMEO! equ 1 (
call :link_target "Romeo.exe" "Building Romeo.exe [!CFG!]" "!ROMEO_NEED_COMPILE!" "%COMPILER_FLAGS%" "%JULIET_OBJS% Intermediate\Romeo\*.cpp" "/link %COMMON_LIBS% /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:\"Intermediate\x64-!CFG!\Romeo.ilk\" /PDB:\"Intermediate\x64-!CFG!\Romeo.pdb\"" call :link_target "Romeo.exe" "Building Romeo.exe [!CFG!]" "!ROMEO_NEED_COMPILE!" "%COMPILER_FLAGS%" "Intermediate\Romeo\*.cpp %IMGUI_OBJS%" "/link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Romeo.ilk /PDB:Intermediate\x64-!CFG!\Romeo.pdb"
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
) )
:: --- JulietShaderCompiler.exe --- :: --- JulietShaderCompiler.exe ---
if !TARGET_SHADER! equ 1 ( if !TARGET_SHADER! equ 1 (
if exist "Intermediate\JulietShaderCompiler\*.cpp" ( if exist "Intermediate\JulietShaderCompiler\*.cpp" (
call :link_target "JulietShaderCompiler.exe" "Building JulietShaderCompiler.exe [!CFG!]" "!SHADER_NEED_COMPILE!" "%COMPILER_FLAGS% /I\"JulietShaderCompiler\"" "%JULIET_OBJS% Intermediate\JulietShaderCompiler\*.cpp" "/link %COMMON_LIBS% dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:\"Intermediate\x64-!CFG!\JulietShaderCompiler.ilk\" /PDB:\"Intermediate\x64-!CFG!\JulietShaderCompiler.pdb\"" call :link_target "JulietShaderCompiler.exe" "Building JulietShaderCompiler.exe [!CFG!]" "!SHADER_NEED_COMPILE!" "%COMPILER_FLAGS% /IJulietShaderCompiler" "Intermediate\JulietShaderCompiler\*.cpp %IMGUI_OBJS%" "/link %COMMON_LIBS% dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietShaderCompiler.ilk /PDB:Intermediate\x64-!CFG!\JulietShaderCompiler.pdb"
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
) )
) )
tools/build_check.cpp
+26 -24
View File
@@ -6,11 +6,11 @@
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif #endif
#include <windows.h> #include <cassert>
#include <cstdint> #include <cstdint>
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <cassert> #include <windows.h>
// ============================================================================ // ============================================================================
// Minimal string / path helpers (no STL, no std::filesystem — pure speed) // Minimal string / path helpers (no STL, no std::filesystem — pure speed)
@@ -25,7 +25,11 @@ struct FixedString
char Data[MaxPath]; char Data[MaxPath];
int Length; int Length;
FixedString() : Data{}, Length(0) {} FixedString()
: Data{}
, Length(0)
{
}
void Set(const char* str) void Set(const char* str)
{ {
@@ -118,7 +122,8 @@ struct FileContent
{ {
assert(path != nullptr); assert(path != nullptr);
FileContent result = { nullptr, 0 }; FileContent result = { nullptr, 0 };
HANDLE file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); HANDLE file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, nullptr);
if (file == INVALID_HANDLE_VALUE) if (file == INVALID_HANDLE_VALUE)
{ {
return result; return result;
@@ -158,7 +163,8 @@ static bool WriteEntireFile(const char* path, const char* data, DWORD size)
{ {
assert(path != nullptr); assert(path != nullptr);
assert(data != nullptr); assert(data != nullptr);
HANDLE file = CreateFileA(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); HANDLE file = CreateFileA(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, nullptr);
if (file == INVALID_HANDLE_VALUE) if (file == INVALID_HANDLE_VALUE)
{ {
return false; return false;
@@ -347,8 +353,8 @@ static void SaveHashCache(const char* cachePath, const HashCache& cache)
for (int i = 0; i < cache.Count; i++) for (int i = 0; i < cache.Count; i++)
{ {
int written = sprintf_s(buffer + offset, bufSize - static_cast<size_t>(offset), int written = sprintf_s(buffer + offset, bufSize - static_cast<size_t>(offset), "%s=%s\n",
"%s=%s\n", cache.Entries[i].Path.Data, cache.Entries[i].HashStr); cache.Entries[i].Path.Data, cache.Entries[i].HashStr);
if (written > 0) if (written > 0)
{ {
offset += written; offset += written;
@@ -490,10 +496,8 @@ struct CleanResult
} }
else else
{ {
if (EndsWithNoCase(findData.cFileName, ".cpp") || if (EndsWithNoCase(findData.cFileName, ".cpp") || EndsWithNoCase(findData.cFileName, ".h") ||
EndsWithNoCase(findData.cFileName, ".h") || EndsWithNoCase(findData.cFileName, ".hpp") || EndsWithNoCase(findData.cFileName, ".inl") ||
EndsWithNoCase(findData.cFileName, ".hpp") ||
EndsWithNoCase(findData.cFileName, ".inl") ||
EndsWithNoCase(findData.cFileName, ".c")) EndsWithNoCase(findData.cFileName, ".c"))
{ {
ULARGE_INTEGER li; ULARGE_INTEGER li;
@@ -506,7 +510,8 @@ struct CleanResult
} }
} }
} }
} while (FindNextFileA(hFind, &findData)); }
while (FindNextFileA(hFind, &findData));
FindClose(hFind); FindClose(hFind);
return newest; return newest;
@@ -589,7 +594,8 @@ static void CollectUnityFiles(const char* dirPath, FilePathList& list)
list.Add(fullPath.Data); list.Add(fullPath.Data);
} }
} }
} while (FindNextFileA(hFind, &findData)); }
while (FindNextFileA(hFind, &findData));
FindClose(hFind); FindClose(hFind);
} }
@@ -955,12 +961,12 @@ static int CommandEvaluate(int argc, char* argv[])
char path[MaxPath]; char path[MaxPath];
sprintf_s(path, "%s\\Juliet_Unity1.obj", intDir);
bool julietNeed = unityChanged || !IsUpToDate(path, julietCombined);
sprintf_s(path, "%s\\ImGui_Unity1.obj", intDir); sprintf_s(path, "%s\\ImGui_Unity1.obj", intDir);
bool imguiNeed = unityChanged || !IsUpToDate(path, imguiTime); bool imguiNeed = unityChanged || !IsUpToDate(path, imguiTime);
sprintf_s(path, "%s\\Juliet.dll", binDir);
bool julietNeed = unityChanged || !IsUpToDate(path, julietCombined);
bool gameNeed = false; bool gameNeed = false;
if (targetJuliet || targetGame) if (targetJuliet || targetGame)
{ {
@@ -990,7 +996,8 @@ static int CommandEvaluate(int argc, char* argv[])
} }
QueryPerformanceCounter(&perfEnd); QueryPerformanceCounter(&perfEnd);
double durationMs = static_cast<double>(perfEnd.QuadPart - perfStart.QuadPart) * 1000.0 / static_cast<double>(perfFreq.QuadPart); double durationMs =
static_cast<double>(perfEnd.QuadPart - perfStart.QuadPart) * 1000.0 / static_cast<double>(perfFreq.QuadPart);
printf("[PERF] Fast Native C++ EvaluateConfig: %.1f ms\n", durationMs); printf("[PERF] Fast Native C++ EvaluateConfig: %.1f ms\n", durationMs);
// Write results // Write results
@@ -1003,13 +1010,8 @@ static int CommandEvaluate(int argc, char* argv[])
"JULIETAPP_NEED_COMPILE=%d\n" "JULIETAPP_NEED_COMPILE=%d\n"
"ROMEO_NEED_COMPILE=%d\n" "ROMEO_NEED_COMPILE=%d\n"
"SHADER_NEED_COMPILE=%d\n", "SHADER_NEED_COMPILE=%d\n",
unityChanged ? 1 : 0, unityChanged ? 1 : 0, julietNeed ? 1 : 0, imguiNeed ? 1 : 0, gameNeed ? 1 : 0,
julietNeed ? 1 : 0, julietAppNeed ? 1 : 0, romeoNeed ? 1 : 0, shaderNeed ? 1 : 0);
imguiNeed ? 1 : 0,
gameNeed ? 1 : 0,
julietAppNeed ? 1 : 0,
romeoNeed ? 1 : 0,
shaderNeed ? 1 : 0);
WriteEntireFile("Intermediate\\config_status.tmp", statusBuf, static_cast<DWORD>(statusLen)); WriteEntireFile("Intermediate\\config_status.tmp", statusBuf, static_cast<DWORD>(statusLen));
fflush(stdout); fflush(stdout);