Skip to content

Commit

Permalink
refactor: align marketplace structure with unity (dx-3545 dx-3546 dx-…
Browse files Browse the repository at this point in the history 
…3551)
  • Loading branch information
@ImmutableJeffrey
ImmutableJeffrey committed Jan 28, 2025
1 parent 40ea1f9 commit ad65e79
Show file tree
Hide file tree
Showing 34 changed files with 575 additions and 807 deletions.
8 changes: 0 additions & 8 deletions Config/DefaultImmutable.ini
View file

This file was deleted.

Binary file modified Content/BlueprintSampleContent/Marketplace/ImtblBridgeWidget4_26.uasset
View file
Binary file not shown.
Binary file modified Content/BlueprintSampleContent/Marketplace/ImtblSwapWidget4_26.uasset
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions Immutable.uplugin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
"Type": "Runtime",
"LoadingPhase": "Default"
},
{
"Name": "ImmutableCore",
"Type": "Runtime",
"LoadingPhase": "Default"
},
{
"Name": "ImmutableEditor",
"Type": "Editor",
Expand Down
191 changes: 96 additions & 95 deletions Source/Immutable/Immutable.Build.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,117 +6,118 @@

public class Immutable : ModuleRules
{
public Immutable(ReadOnlyTargetRules Target) : base(Target)
{
PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
public Immutable(ReadOnlyTargetRules Target) : base(Target)
{
PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;

#if UE_5_1_OR_LATER
IncludeOrderVersion = EngineIncludeOrderVersion.Latest;
#endif
RuntimeDependencies.Add("$(PluginDir)/Web/index.js");
RuntimeDependencies.Add("$(PluginDir)/Web/index.js");

PublicDependencyModuleNames.AddRange(
new string[]
{
"Core",
"JsonUtilities",
}
);

PrivateDependencyModuleNames.AddRange(
new string[]
{
"CoreUObject",
"Engine",
"Slate",
"SlateCore",
"Json",
"UMG",
"Projects",
"DeveloperSettings",
"HTTP",
}
);
PublicDependencyModuleNames.AddRange(new string[]
{
"Core",
"JsonUtilities"
});

PublicDependencyModuleNames.AddRange(new string[]
{
"ImmutableCore"
});

PrivateDependencyModuleNames.AddRange(new string[]
{
"CoreUObject",
"Engine",
"Slate",
"SlateCore",
"Json",
"UMG",
"Projects",
"DeveloperSettings",
"HTTP",
});

#if UE_5_1_OR_LATER
PublicDependencyModuleNames.AddRange(
new string[]
{
"WebBrowser",
"WebBrowserWidget"
}
);
PublicDependencyModuleNames.AddRange(
new string[]
{
"WebBrowser",
"WebBrowserWidget"
}
);
#else
PrivateDependencyModuleNames.Add("BluExtension");
if (Target.Platform == UnrealTargetPlatform.Win64)
{
PublicDependencyModuleNames.Add("Blu");
}
PrivateDependencyModuleNames.Add("BluExtension");
if (Target.Platform == UnrealTargetPlatform.Win64)
{
PublicDependencyModuleNames.Add("Blu");
}
#endif

#if UE_5_1_OR_LATER
PrivateDependencyModuleNames.Add("WebBrowser");
PublicDefinitions.Add("USING_BUNDLED_CEF=1");
PublicDefinitions.Add("USING_BLUI_CEF=0");
#else
if (Target.Platform == UnrealTargetPlatform.Win64)
{
PublicDefinitions.Add("USING_BLUI_CEF=1");
}
else
{
PublicDefinitions.Add("USING_BLUI_CEF=0");
}

PublicDefinitions.Add("USING_BUNDLED_CEF=0");
if (Target.Platform == UnrealTargetPlatform.Win64)
{
PublicDefinitions.Add("USING_BLUI_CEF=1");
}
else
{
PublicDefinitions.Add("USING_BLUI_CEF=0");
}

PublicDefinitions.Add("USING_BUNDLED_CEF=0");
#endif

DynamicallyLoadedModuleNames.AddRange(
new string[]
{
DynamicallyLoadedModuleNames.AddRange(
new string[]
{
// ... add any modules that your module loads dynamically here ...
}
);
if (Target.bBuildEditor == true)
{
PrivateDependencyModuleNames.Add("UnrealEd");
}

if (Target.Platform == UnrealTargetPlatform.Android)
{
PrivateDependencyModuleNames.AddRange(new string[] { "Launch" });

string PluginPath = Utils.MakePathRelativeTo(ModuleDirectory, Target.RelativeEnginePath);
AdditionalPropertiesForReceipt.Add("AndroidPlugin", Path.Combine(PluginPath, "Immutable_UPL_Android.xml"));
}

if (Target.Platform == UnrealTargetPlatform.IOS)
{
PrivateDependencyModuleNames.AddRange(new string[] { "Launch" });

PrivateIncludePaths.AddRange(new string[] { Path.Combine(ModuleDirectory, "Private/Immutable", "IOS") });

PublicFrameworks.AddRange(
new string[]
{
"Foundation",
"AuthenticationServices"
}
);
}

if (Target.Platform == UnrealTargetPlatform.Mac)
{
PrivateIncludePaths.AddRange(new string[] { Path.Combine(ModuleDirectory, "Private/Immutable", "Mac") });

PublicFrameworks.AddRange(
new string[]
{
"Foundation",
"AuthenticationServices"
}
);
}
}
);

if (Target.bBuildEditor == true)
{
PrivateDependencyModuleNames.Add("UnrealEd");
}

if (Target.Platform == UnrealTargetPlatform.Android)
{
PrivateDependencyModuleNames.AddRange(new string[] { "Launch" });

string PluginPath = Utils.MakePathRelativeTo(ModuleDirectory, Target.RelativeEnginePath);
AdditionalPropertiesForReceipt.Add("AndroidPlugin", Path.Combine(PluginPath, "Immutable_UPL_Android.xml"));
}

if (Target.Platform == UnrealTargetPlatform.IOS)
{
PrivateDependencyModuleNames.AddRange(new string[] { "Launch" });

PrivateIncludePaths.AddRange(new string[] { Path.Combine(ModuleDirectory, "Private/Immutable", "IOS") });

PublicFrameworks.AddRange(
new string[]
{
"Foundation",
"AuthenticationServices"
}
);
}

if (Target.Platform == UnrealTargetPlatform.Mac)
{
PrivateIncludePaths.AddRange(new string[] { Path.Combine(ModuleDirectory, "Private/Immutable", "Mac") });

PublicFrameworks.AddRange(
new string[]
{
"Foundation",
"AuthenticationServices"
}
);
}
}
}
73 changes: 0 additions & 73 deletions Source/Immutable/Private/Immutable/Marketplace/ImtblBridgeRequest.cpp
View file

This file was deleted.

85 changes: 0 additions & 85 deletions Source/Immutable/Private/Immutable/Marketplace/ImtblSwapRequest.cpp
View file

This file was deleted.

Loading

0 comments on commit ad65e79

Please sign in to comment.