Removed fastbuild completely and converted the last two remaining scripts
This commit is contained in:
+3
-6
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user