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

Removed fastbuild completely and converted the last two remaining scripts

Browse Source
This commit is contained in:
Patedam
2026-07-27 15:47:47 -04:00
parent c3c245335d
commit 218a1d00ac
14 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
misc/FBuild.exe
BIN
View File
Binary file not shown.
misc/FBuildWorker.exe
BIN
View File
Binary file not shown.
misc/agent_build.bat
-3
View File
@@ -1,3 +0,0 @@
@echo off
call misc\shell.bat
fbuild %* -cache
misc/build.bat
+3 -6
View File
@@ -10,7 +10,7 @@ setlocal enabledelayedexpansion
set SCRIPT_DIR=%~dp0
cd /d "%SCRIPT_DIR%.."
set FBUILD=misc\fbuild.exe
set BUILD_TOOL=misc\build_system.exe
set BUILD_SRC=tools\build_system.c
@@ -47,10 +47,7 @@ if !CONFIG_SPECIFIED! equ 0 set CONFIG_DEBUG=1& if !TARGET_SPECIFIED! equ 0 set
if !TARGET_SPECIFIED! equ 0 set TARGET_JULIET=1& set TARGET_GAME=1& set TARGET_ROMEO=1& set TARGET_SHADER=1
:do_compile_build_tool
if not exist "%FBUILD%" (
echo [BUILD FAILED] Could not find %FBUILD%.
exit /b 1
)
:: Find Clang / MSVC compiler
set COMPILER=clang-cl.exe
@@ -224,7 +221,7 @@ if !TARGET_SHADER! equ 1 (
echo STEP Building JulietShaderCompiler.exe [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT bin\x64-!CFG!\JulietShaderCompiler.exe>>"!PLAN_FILE!"
echo DEPENDS JulietShaderCompiler^|Juliet^|External\imgui>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /IJulietShaderCompiler /Fe"bin\x64-!CFG!\JulietShaderCompiler.exe" 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>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /IJulietShaderCompiler /Fe"bin\x64-!CFG!\JulietShaderCompiler.exe" Intermediate\JulietShaderCompiler\*.cpp /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
misc/recompile_shaders.bat
+1 -1
View File
@@ -1,7 +1,7 @@
@echo off
setlocal enabledelayedexpansion
set TARGET=x64Clang-Release
set TARGET=x64-Release
REM Chemin relatif vers JulietShaderCompiler.exe
set COMPILER_PATH=bin\%TARGET%\JulietShaderCompiler.exe
misc/ship.bat
+6 -6
View File
@@ -2,16 +2,16 @@
setlocal
REM ============================================================
REM ship.bat - Build clang-Release and prepare Ship/ folder
REM ship.bat - Build Release and prepare Ship/ folder
REM ============================================================
set ROOT=%~dp0..
set BUILD_DIR=%ROOT%\bin\x64Clang-Release
set BUILD_DIR=%ROOT%\bin\x64-Release
set SHIP_DIR=%ROOT%\Ship
REM Step 0: Build Shader Compiler
echo [Ship] Building Shader Compiler...
call "%~dp0fbuild" JulietShaderCompiler-x64Clang-Release -cache
call "%~dp0build.bat" release shadercompiler
if errorlevel 1 (
echo [Ship] SHADER COMPILER BUILD FAILED
exit /b 1
@@ -25,9 +25,9 @@ if errorlevel 1 (
exit /b 1
)
REM Step 2: Build clang-Release
echo [Ship] Building clang-Release...
call "%~dp0fbuild" clang-Release -cache
REM Step 2: Build Release
echo [Ship] Building Release...
call "%~dp0build.bat" release juliet game
if errorlevel 1 (
echo [Ship] BUILD FAILED
exit /b 1