Skip to content

Commit 5913313

Browse files
metalurgicalmetalurgical
committed
fix: packaging for windows
Remove problematic includes that were not being used. Show mouse cursor by default in example. Show only sessionID on login instead of json response.
1 parent f1b6b66 commit 5913313

15 files changed

+144
-17
lines changed

‎.editorconfig

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
[*.{cpp,h}]
2+
3+
# Naming convention rules (note: currently need to be ordered from more to less specific)
4+
5+
cpp_naming_rule.aactor_prefixed.symbols = aactor_class
6+
cpp_naming_rule.aactor_prefixed.style = aactor_style
7+
8+
cpp_naming_rule.swidget_prefixed.symbols = swidget_class
9+
cpp_naming_rule.swidget_prefixed.style = swidget_style
10+
11+
cpp_naming_rule.uobject_prefixed.symbols = uobject_class
12+
cpp_naming_rule.uobject_prefixed.style = uobject_style
13+
14+
cpp_naming_rule.booleans_prefixed.symbols = boolean_vars
15+
cpp_naming_rule.booleans_prefixed.style = boolean_style
16+
17+
cpp_naming_rule.structs_prefixed.symbols = structs
18+
cpp_naming_rule.structs_prefixed.style = unreal_engine_structs
19+
20+
cpp_naming_rule.enums_prefixed.symbols = enums
21+
cpp_naming_rule.enums_prefixed.style = unreal_engine_enums
22+
23+
cpp_naming_rule.templates_prefixed.symbols = templates
24+
cpp_naming_rule.templates_prefixed.style = unreal_engine_templates
25+
26+
cpp_naming_rule.general_names.symbols = all_symbols
27+
cpp_naming_rule.general_names.style = unreal_engine_default
28+
29+
# Naming convention symbols
30+
31+
cpp_naming_symbols.aactor_class.applicable_kinds = class
32+
cpp_naming_symbols.aactor_class.applicable_type = AActor
33+
34+
cpp_naming_symbols.swidget_class.applicable_kinds = class
35+
cpp_naming_symbols.swidget_class.applicable_type = SWidget
36+
37+
cpp_naming_symbols.uobject_class.applicable_kinds = class
38+
cpp_naming_symbols.uobject_class.applicable_type = UObject
39+
40+
cpp_naming_symbols.boolean_vars.applicable_kinds = local,parameter,field
41+
cpp_naming_symbols.boolean_vars.applicable_type = bool
42+
43+
cpp_naming_symbols.enums.applicable_kinds = enum
44+
45+
cpp_naming_symbols.templates.applicable_kinds = template_class
46+
47+
cpp_naming_symbols.structs.applicable_kinds = struct
48+
49+
cpp_naming_symbols.all_symbols.applicable_kinds = *
50+
51+
# Naming convention styles
52+
53+
cpp_naming_style.unreal_engine_default.capitalization = pascal_case
54+
cpp_naming_style.unreal_engine_default.required_prefix =
55+
cpp_naming_style.unreal_engine_default.required_suffix =
56+
cpp_naming_style.unreal_engine_default.word_separator =
57+
58+
cpp_naming_style.unreal_engine_enums.capitalization = pascal_case
59+
cpp_naming_style.unreal_engine_enums.required_prefix = E
60+
cpp_naming_style.unreal_engine_enums.required_suffix =
61+
cpp_naming_style.unreal_engine_enums.word_separator =
62+
63+
cpp_naming_style.unreal_engine_templates.capitalization = pascal_case
64+
cpp_naming_style.unreal_engine_templates.required_prefix = T
65+
cpp_naming_style.unreal_engine_templates.required_suffix =
66+
cpp_naming_style.unreal_engine_templates.word_separator =
67+
68+
cpp_naming_style.unreal_engine_structs.capitalization = pascal_case
69+
cpp_naming_style.unreal_engine_structs.required_prefix = F
70+
cpp_naming_style.unreal_engine_structs.required_suffix =
71+
cpp_naming_style.unreal_engine_structs.word_separator =
72+
73+
cpp_naming_style.uobject_style.capitalization = pascal_case
74+
cpp_naming_style.uobject_style.required_prefix = U
75+
cpp_naming_style.uobject_style.required_suffix =
76+
cpp_naming_style.uobject_style.word_separator =
77+
78+
cpp_naming_style.aactor_style.capitalization = pascal_case
79+
cpp_naming_style.aactor_style.required_prefix = A
80+
cpp_naming_style.aactor_style.required_suffix =
81+
cpp_naming_style.aactor_style.word_separator =
82+
83+
cpp_naming_style.swidget_style.capitalization = pascal_case
84+
cpp_naming_style.swidget_style.required_prefix = S
85+
cpp_naming_style.swidget_style.required_suffix =
86+
cpp_naming_style.swidget_style.word_separator =
87+
88+
cpp_naming_style.boolean_style.capitalization = pascal_case
89+
cpp_naming_style.boolean_style.required_prefix = b
90+
cpp_naming_style.boolean_style.required_suffix =
91+
cpp_naming_style.boolean_style.word_separator =

‎.vsconfig

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.Net.Component.4.6.2.TargetingPack",
5+
"Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64",
6+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
7+
"Microsoft.VisualStudio.Component.Windows10SDK.22000",
8+
"Microsoft.VisualStudio.Workload.CoreEditor",
9+
"Microsoft.VisualStudio.Workload.ManagedDesktop",
10+
"Microsoft.VisualStudio.Workload.NativeDesktop",
11+
"Microsoft.VisualStudio.Workload.NativeGame"
12+
]
13+
}

‎Config/DefaultEngine.ini

+29
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,35 @@ AppliedDefaultGraphicsPerformance=Maximum
1313

1414
[/Script/WindowsTargetPlatform.WindowsTargetSettings]
1515
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
16+
-D3D12TargetedShaderFormats=PCD3D_SM5
17+
+D3D12TargetedShaderFormats=PCD3D_SM5
18+
+D3D12TargetedShaderFormats=PCD3D_SM6
19+
-D3D11TargetedShaderFormats=PCD3D_SM5
20+
+D3D11TargetedShaderFormats=PCD3D_SM5
21+
+VulkanTargetedShaderFormats=SF_VULKAN_SM5
22+
+VulkanTargetedShaderFormats=SF_VULKAN_SM6
23+
Compiler=Default
24+
AudioSampleRate=48000
25+
AudioCallbackBufferFrameSize=1024
26+
AudioNumBuffersToEnqueue=1
27+
AudioMaxChannels=0
28+
AudioNumSourceWorkers=4
29+
SpatializationPlugin=
30+
SourceDataOverridePlugin=
31+
ReverbPlugin=
32+
OcclusionPlugin=
33+
CompressionOverrides=(bOverrideCompressionTimes=False,DurationThreshold=5.000000,MaxNumRandomBranches=0,SoundCueQualityIndex=0)
34+
CacheSizeKB=65536
35+
MaxChunkSizeOverrideKB=0
36+
bResampleForDevice=False
37+
MaxSampleRate=48000.000000
38+
HighSampleRate=32000.000000
39+
MedSampleRate=24000.000000
40+
LowSampleRate=12000.000000
41+
MinSampleRate=8000.000000
42+
CompressionQualityModifier=1.000000
43+
AutoStreamingThreshold=0.000000
44+
SoundCueCookQualityIndex=-1
1645

1746
[/Script/Engine.RendererSettings]
1847
r.GenerateMeshDistanceFields=True

‎Content/BaseGameMode.uasset

202 Bytes
Binary file not shown.

‎Content/MouseCursor.uasset

18.3 KB
Binary file not shown.

‎Plugins/Web3AuthSDK/Content/AuthInterface.uasset

2.43 KB
Binary file not shown.

‎Plugins/Web3AuthSDK/Source/.DS_Store

-6 KB
Binary file not shown.

‎Plugins/Web3AuthSDK/Source/Web3AuthSDK/.DS_Store

-6 KB
Binary file not shown.

‎Plugins/Web3AuthSDK/Source/Web3AuthSDK/Private/.DS_Store

-6 KB
Binary file not shown.

‎Plugins/Web3AuthSDK/Source/Web3AuthSDK/Private/Android/.DS_Store

-6 KB
Binary file not shown.

‎Plugins/Web3AuthSDK/Source/Web3AuthSDK/Private/IOS/.DS_Store

-6 KB
Binary file not shown.

‎Plugins/Web3AuthSDK/Source/Web3AuthSDK/Public/ECCrypto.h

-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
#pragma once
22

3-
#if PLATFORM_WINDOWS
4-
#pragma warning(disable:4996)
5-
#pragma comment(lib, "crypt32.lib")
6-
#pragma comment(lib, "WS2_32.lib")
7-
#endif
8-
93
#include "CoreMinimal.h"
104

115
#define UI UI_ST

‎Plugins/Web3AuthSDK/Source/Web3AuthSDK/Public/Web3Auth.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,6 @@ class WEB3AUTHSDK_API UWeb3Auth : public UGameInstanceSubsystem
575575

576576
TSharedPtr<IHttpRouter> httpRouter;
577577
TArray<TPair<TSharedPtr<IHttpRouter>, FHttpRouteHandle>> httpRoutes;
578-
FWeb3AuthResponse web3AuthResponse;
579578
UPROPERTY(Transient)
580579
UECCrypto* crypto;
581580
UPROPERTY(Transient)
@@ -588,8 +587,10 @@ class WEB3AUTHSDK_API UWeb3Auth : public UGameInstanceSubsystem
588587
virtual void Initialize(FSubsystemCollectionBase& Collection) override;
589588
virtual void Deinitialize() override;
590589
public:
590+
UPROPERTY(VisibleAnywhere, BlueprintReadOnly)
591+
FWeb3AuthResponse web3AuthResponse;
591592

592-
UPROPERTY()
593+
UPROPERTY(BlueprintReadOnly)
593594
FString sessionId = FString();
594595

595596
UFUNCTION(BlueprintCallable)

‎Plugins/Web3AuthSDK/Source/Web3AuthSDK/Web3AuthSDK.Build.cs

-9
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,6 @@ public Web3AuthSDK(ReadOnlyTargetRules Target) : base(Target)
8484
if (Target.Platform == UnrealTargetPlatform.Win64)
8585
{
8686
PrivateDependencyModuleNames.Add("OpenSSL");
87-
88-
if (Target.LinkType == TargetLinkType.Monolithic)
89-
{
90-
PrivateDependencyModuleNames.Add("ws2_32");
91-
}
92-
else
93-
{
94-
PublicAdditionalLibraries.Add("ws2_32.lib");
95-
}
9687
}
9788

9889
DynamicallyLoadedModuleNames.AddRange(

‎shadertoolsconfig.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"hlsl.preprocessorDefinitions": {
3+
},
4+
" hlsl.additionalIncludeDirectories": [
5+
],
6+
"hlsl.virtualDirectoryMappings": {
7+
}
8+
}

0 commit comments

Comments
 (0)