Fix bugs in animation queue handling, and add animation timeouts
This commit is contained in:
11
build.py
11
build.py
@@ -156,6 +156,7 @@ def autodetect_system_config():
|
||||
config.DOT_EXE = ".exe"
|
||||
config.USER = "Unknown"
|
||||
config.BUILD_BAT = "Build.bat"
|
||||
config.DEBUG = "DebugGame"
|
||||
else:
|
||||
config.OS = "Linux"
|
||||
config.DLL = "so"
|
||||
@@ -163,6 +164,7 @@ def autodetect_system_config():
|
||||
config.DOT_EXE = ""
|
||||
config.USER = os.environ["USER"]
|
||||
config.BUILD_BAT = "Linux/Build.sh"
|
||||
config.DEBUG = "DebugGame"
|
||||
return config
|
||||
|
||||
|
||||
@@ -170,13 +172,14 @@ def store_system_config_in_globals(config):
|
||||
"""
|
||||
Copy all the config data from the config object into global variables.
|
||||
"""
|
||||
global OS,DLL,BAT,DOT_EXE,USER,BUILD_BAT,INTEGRATION,UNREALENGINE
|
||||
global OS,DLL,BAT,DOT_EXE,USER,BUILD_BAT,DEBUG,INTEGRATION,UNREALENGINE
|
||||
OS = config.OS
|
||||
DLL = config.DLL
|
||||
BAT = config.BAT
|
||||
DOT_EXE = config.DOT_EXE
|
||||
USER = config.USER
|
||||
BUILD_BAT = config.BUILD_BAT
|
||||
DEBUG = config.DEBUG
|
||||
INTEGRATION = config.INTEGRATION
|
||||
UNREALENGINE = config.UNREALENGINE
|
||||
|
||||
@@ -278,7 +281,7 @@ def build_luprex_and_integration():
|
||||
This builds our C++ code, and also UnrealEngine's C++ code.
|
||||
"""
|
||||
shell(f"{INTEGRATION}/luprex", "make all")
|
||||
shell(INTEGRATION, f"{UNREALENGINE}/Engine/Build/BatchFiles/{BUILD_BAT} -waitmutex IntegrationEditor {OS} DebugGame {INTEGRATION}/Integration.uproject")
|
||||
shell(INTEGRATION, f"{UNREALENGINE}/Engine/Build/BatchFiles/{BUILD_BAT} -waitmutex IntegrationEditor {OS} {DEBUG} {INTEGRATION}/Integration.uproject")
|
||||
|
||||
|
||||
#
|
||||
@@ -291,7 +294,7 @@ def build_intellisense_database_for_clangd():
|
||||
based on clangd how to compile each source file.
|
||||
This also installs a .clangd file in the UnrealEngine directory.
|
||||
"""
|
||||
mods1 = Path(f"{INTEGRATION}/Intermediate/Build/{OS}").rglob("UnrealEditor/DebugGame/**/Module.*.o.rsp")
|
||||
mods1 = Path(f"{INTEGRATION}/Intermediate/Build/{OS}").rglob("UnrealEditor/{DEBUG}/**/Module.*.o.rsp")
|
||||
mods2 = Path(f"{UNREALENGINE}/Engine/Intermediate/Build/{OS}").rglob("UnrealEditor/Development/**/Module.*.o.rsp")
|
||||
mods = list(mods1) + list(mods2)
|
||||
clangs = list(Path(f"{UNREALENGINE}/Engine/Extras/ThirdPartyNotUE/SDKs").rglob("*-linux-gnu/bin/clang++"))
|
||||
@@ -333,7 +336,7 @@ def build_clean():
|
||||
This code is underdeveloped.
|
||||
"""
|
||||
shell(f"{INTEGRATION}/luprex", "make clean")
|
||||
shell(INTEGRATION, f"{UNREALENGINE}/Engine/Build/BatchFiles/{BUILD_BAT} -waitmutex IntegrationEditor {OS} DebugGame {INTEGRATION}/Integration.uproject -clean")
|
||||
shell(INTEGRATION, f"{UNREALENGINE}/Engine/Build/BatchFiles/{BUILD_BAT} -waitmutex IntegrationEditor {OS} {DEBUG} {INTEGRATION}/Integration.uproject -clean")
|
||||
Path(f"{INTEGRATION}/.vscode/compile_commands.json").unlink(missing_ok = True)
|
||||
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user