talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New build.py script, replaces build-everything.py and Makefile

Browse Source
This commit is contained in:
jyelon
2025-06-11 18:46:10 -04:00
parent 4a2574ddab
commit 5a81b2d8ae
5 changed files with 365 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
EnginePatches/EnginePatch
View File

@@ -37,41 +37,29 @@ index ca5f4b5fb5ff..a436a624d5b7 100644
// If we're rendering offscreen, use the "dummy" SDL video driver
if (FParse::Param(FCommandLine::Get(), TEXT("RenderOffScreen")) && !getenv("SDL_VIDEODRIVER"))
{
diff --git a/Engine/Source/Runtime/Core/Private/Logging/LogMacros.cpp b/Engine/Source/Runtime/Core/Private/Logging/LogMacros.cpp
index 1677269adb69..dae6bcde6c25 100644
--- a/Engine/Source/Runtime/Core/Private/Logging/LogMacros.cpp
+++ b/Engine/Source/Runtime/Core/Private/Logging/LogMacros.cpp
@@ -10,6 +10,13 @@
#include "Stats/Stats.h"
#include "ProfilingDebugging/CsvProfiler.h"
diff --git a/Setup.bat b/Setup.bat
index 34e1cea1e7d2..16bfbe803ac1 100755
--- a/Setup.bat
+++ b/Setup.bat
@@ -28,7 +28,7 @@ start /wait Engine\Extras\Redist\en-us\UEPrereqSetup_x64.exe /quiet /norestart
+namespace UBreakPoint {
+ volatile int OnLogError_V;
+ FORCENOINLINE static void OnLogError() {
+ OnLogError_V = 0;
+ }
+}
+
void StaticFailDebugV(const TCHAR* Error, const ANSICHAR* Expression, const ANSICHAR* File, int32 Line, bool bIsEnsure, void* ProgramCounter, const TCHAR* DescriptionFormat, va_list DescriptionArgs);
rem Register the engine installation...
if not exist .\Engine\Binaries\Win64\UnrealVersionSelector-Win64-Shipping.exe goto :no_unreal_version_selector
-.\Engine\Binaries\Win64\UnrealVersionSelector-Win64-Shipping.exe /register
+.\Engine\Binaries\Win64\UnrealVersionSelector-Win64-Shipping.exe /register /unattended
:no_unreal_version_selector
rem Done!
diff --git a/Setup.sh b/Setup.sh
index f91a96aaac6b..12897001c96b 100755
--- a/Setup.sh
+++ b/Setup.sh
@@ -80,7 +80,7 @@ else
echo Register the engine installation...
if [ -f Engine/Binaries/Linux/UnrealVersionSelector-Linux-Shipping ]; then
pushd Engine/Binaries/Linux > /dev/null
- ./UnrealVersionSelector-Linux-Shipping -register > /dev/null &
+ ./UnrealVersionSelector-Linux-Shipping -register -unattended > /dev/null &
popd > /dev/null
fi
CSV_DEFINE_CATEGORY(FMsgLogf, true);
@@ -35,6 +42,9 @@ void FMsg::LogfImpl(const ANSICHAR* File, int32 Line, const FLogCategoryName& Ca
}
GROWABLE_LOGF(LogOverride ? LogOverride->Log(Category, Verbosity, Buffer)
: GLog->RedirectLog(Category, Verbosity, Buffer))
+ if (Verbosity == ELogVerbosity::Error) {
+ UBreakPoint::OnLogError();
+ }
}
else
{
@@ -79,6 +89,9 @@ void FMsg::LogV(const ANSICHAR* File, int32 Line, const FLogCategoryName& Catego
{
(OutputDevice ? OutputDevice : GLog)->Serialize(Message, Verbosity, Category);
});
+ if (Verbosity == ELogVerbosity::Error) {
+ UBreakPoint::OnLogError();
+ }
}
else
{