Still trying to get intellisense to work
This commit is contained in:
@@ -1,3 +1,12 @@
|
|||||||
|
diff --git a/.clangd b/.clangd
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000000..e10607a4bc4f
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/.clangd
|
||||||
|
@@ -0,0 +1,3 @@
|
||||||
|
+CompileFlags:
|
||||||
|
+ Add:
|
||||||
|
+ - "-D__INTELLISENSE__=1"
|
||||||
diff --git a/Engine/Extras/LLDBDataFormatters/UEDataFormatters_2ByteChars.py b/Engine/Extras/LLDBDataFormatters/UEDataFormatters_2ByteChars.py
|
diff --git a/Engine/Extras/LLDBDataFormatters/UEDataFormatters_2ByteChars.py b/Engine/Extras/LLDBDataFormatters/UEDataFormatters_2ByteChars.py
|
||||||
index f56f5ea9cac4..ff1c4030b38f 100644
|
index f56f5ea9cac4..ff1c4030b38f 100644
|
||||||
--- a/Engine/Extras/LLDBDataFormatters/UEDataFormatters_2ByteChars.py
|
--- a/Engine/Extras/LLDBDataFormatters/UEDataFormatters_2ByteChars.py
|
||||||
|
|||||||
@@ -39,8 +39,9 @@
|
|||||||
},
|
},
|
||||||
"editor.acceptSuggestionOnEnter": "off",
|
"editor.acceptSuggestionOnEnter": "off",
|
||||||
"C_Cpp.intelliSenseEngine": "disabled",
|
"C_Cpp.intelliSenseEngine": "disabled",
|
||||||
"clangd.path": "/usr/bin/clangd-15",
|
"clangd.path": "/usr/bin/clangd-16",
|
||||||
"clangd.arguments": [
|
"clangd.arguments": [
|
||||||
|
"--log=verbose",
|
||||||
"--query-driver=/usr/bin/g++",
|
"--query-driver=/usr/bin/g++",
|
||||||
"--compile-commands-dir=[INTEGRATION]/.vscode",
|
"--compile-commands-dir=[INTEGRATION]/.vscode",
|
||||||
"--header-insertion=never"
|
"--header-insertion=never"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
|
|
||||||
#include "AnimQueue.h"
|
#include "AnimQueue.h"
|
||||||
#include "UtilityLibrary.h"
|
#include "UtilityLibrary.h"
|
||||||
|
#include "GameFramework/Actor.h"
|
||||||
|
|
||||||
FlxAnimationStep::FlxAnimationStep(uint64 hash, std::string_view body) {
|
FlxAnimationStep::FlxAnimationStep(uint64 hash, std::string_view body) {
|
||||||
Finished = false;
|
Finished = false;
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CoreMinimal.h"
|
#include "CoreMinimal.h"
|
||||||
|
#include "CoreUObject.h"
|
||||||
#include "StringDecoder.h"
|
#include "StringDecoder.h"
|
||||||
#include "Containers/Deque.h"
|
#include "Containers/Deque.h"
|
||||||
|
|
||||||
#include "AnimQueue.generated.h"
|
#include "AnimQueue.generated.h"
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
#include "Components/Widget.h"
|
#include "Components/Widget.h"
|
||||||
#include "WidgetBlueprint.h"
|
#include "WidgetBlueprint.h"
|
||||||
#include "Blueprint/UserWidget.h"
|
#include "Blueprint/UserWidget.h"
|
||||||
|
#include "Engine/StaticMesh.h"
|
||||||
|
|
||||||
void UlxAssetLookup::RebuildIndex()
|
void UlxAssetLookup::RebuildIndex()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,11 +6,13 @@
|
|||||||
|
|
||||||
#include "Containers/Array.h"
|
#include "Containers/Array.h"
|
||||||
#include "CoreMinimal.h"
|
#include "CoreMinimal.h"
|
||||||
|
#include "InputCoreTypes.h"
|
||||||
#include "HAL/Platform.h"
|
#include "HAL/Platform.h"
|
||||||
#include "Misc/OutputDeviceError.h"
|
#include "Misc/OutputDeviceError.h"
|
||||||
#include "UObject/NameTypes.h"
|
#include "UObject/NameTypes.h"
|
||||||
#include "UObject/ObjectMacros.h"
|
#include "UObject/ObjectMacros.h"
|
||||||
#include "UObject/UObjectGlobals.h"
|
#include "UObject/UObjectGlobals.h"
|
||||||
|
#include "Kismet/BlueprintFunctionLibrary.h"
|
||||||
|
|
||||||
#include "BlueprintErrors.generated.h"
|
#include "BlueprintErrors.generated.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
#include "CommonTypes.generated.h"
|
#include "CommonTypes.generated.h"
|
||||||
|
|
||||||
namespace CommonTypes {
|
namespace CommonTypes {
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "Containers/UnrealString.h"
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// ConsoleOutput
|
// ConsoleOutput
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
#include "CoreMinimal.h"
|
#include "CoreMinimal.h"
|
||||||
#include "EdGraph/EdGraphPin.h"
|
#include "EdGraph/EdGraphPin.h"
|
||||||
|
#include <string_view>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
#include "LuaCall.generated.h"
|
#include "LuaCall.generated.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "CoreMinimal.h"
|
#include "CoreMinimal.h"
|
||||||
|
#include "HAL/Runnable.h"
|
||||||
|
|
||||||
///////////////////////////////////////////////
|
///////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
|
|||||||
15
build.py
15
build.py
@@ -275,11 +275,11 @@ def build_intellisense_database_for_clangd(force):
|
|||||||
error = e
|
error = e
|
||||||
else:
|
else:
|
||||||
error = None
|
error = None
|
||||||
finally:
|
# finally:
|
||||||
tarfile.open(f"{INTEGRATION}/rsp_files.tgz").extractall(path=f"{INTEGRATION}/Intermediate")
|
# tarfile.open(f"{INTEGRATION}/rsp_files.tgz").extractall(path=f"{INTEGRATION}/Intermediate")
|
||||||
tarfile.open(f"{UNREALENGINE}/rsp_files.tgz").extractall(path=f"{UNREALENGINE}/Engine")
|
# tarfile.open(f"{UNREALENGINE}/rsp_files.tgz").extractall(path=f"{UNREALENGINE}/Engine")
|
||||||
Path(f"{INTEGRATION}/rsp_files.tgz").unlink()
|
# Path(f"{INTEGRATION}/rsp_files.tgz").unlink()
|
||||||
Path(f"{UNREALENGINE}/rsp_files.tgz").unlink()
|
# Path(f"{UNREALENGINE}/rsp_files.tgz").unlink()
|
||||||
if error: raise error
|
if error: raise error
|
||||||
hash_file.write_text(new_hash)
|
hash_file.write_text(new_hash)
|
||||||
|
|
||||||
@@ -319,6 +319,9 @@ CONFIG = autodetect_system_config()
|
|||||||
store_system_config_in_globals(CONFIG)
|
store_system_config_in_globals(CONFIG)
|
||||||
os.chdir(f"{INTEGRATION}/EnginePatches")
|
os.chdir(f"{INTEGRATION}/EnginePatches")
|
||||||
|
|
||||||
|
if MODE == "experiment":
|
||||||
|
build_intellisense_database_for_clangd(True)
|
||||||
|
|
||||||
if MODE == "all":
|
if MODE == "all":
|
||||||
checkout_correct_unreal_engine_branch_and_apply_patch()
|
checkout_correct_unreal_engine_branch_and_apply_patch()
|
||||||
generate_buildconfiguration_xml()
|
generate_buildconfiguration_xml()
|
||||||
@@ -330,7 +333,7 @@ if MODE == "all":
|
|||||||
|
|
||||||
if MODE in ["all", "c++"]:
|
if MODE in ["all", "c++"]:
|
||||||
build_luprex_and_integration()
|
build_luprex_and_integration()
|
||||||
build_intellisense_database_for_clangd(MODE == "all")
|
# build_intellisense_database_for_clangd(MODE == "all")
|
||||||
|
|
||||||
if MODE == "clean":
|
if MODE == "clean":
|
||||||
build_clean()
|
build_clean()
|
||||||
|
|||||||
Reference in New Issue
Block a user