Skip to content

Preliminary PR #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cybik wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Preliminary PR #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20bb41e
Source part of a platform adjustment
cybik Nov 3, 2020
dbad84d
Libs
cybik Nov 3, 2020
c0a4bb3
compile nit
cybik Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ Binaries/
Source/ThirdParty/InkGlue/.vs/
.vs/
Saved/
.vscode/
42 changes: 30 additions & 12 deletions Plugins/UnrealInk/Source/Ink/Ink.Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,28 @@ public Ink(ReadOnlyTargetRules Target) : base(Target)
// Copy dlls and assemblies to output directory
// --------------------------------------------

string PlatformString = (Target.Platform == UnrealTargetPlatform.Win64) ? "Win64" : "Win32";
if (Target.Platform == UnrealTargetPlatform.Win64 || Target.Platform == UnrealTargetPlatform.Win32)
string PlatformString = "";
string SgenAssemblyFileName = "mono-2.0-sgen.dll"; // default
if(Target.Platform == UnrealTargetPlatform.Win64)
{
RuntimeDependencies.Add("$(TargetOutputDir)/mono-2.0-sgen.dll", Path.Combine(pluginDirectory, "ThirdParty/Mono/lib", PlatformString, "mono-2.0-sgen.dll"));
PlatformString = "Win64";
}
else if (Target.Platform == UnrealTargetPlatform.Mac)
else if(Target.Platform == UnrealTargetPlatform.Win32)
{
RuntimeDependencies.Add("$(TargetOutputDir)/libmonosgen-2.0.dylib", Path.Combine(pluginDirectory, "ThirdParty/Mono/lib", PlatformString, "libmonosgen-2.0.dylib"));
PlatformString = "Win32";
}
else if(Target.Platform == UnrealTargetPlatform.Mac)
{
PlatformString = "Mac";
SgenAssemblyFileName = "libmonosgen-2.0.dylib";
}
else if(Target.Platform == UnrealTargetPlatform.Linux)
{
// todo: 64bit vs 32bit, differences on Linux?
PlatformString = "Linux";
SgenAssemblyFileName = "libmonosgen-2.0.so";
}
RuntimeDependencies.Add(("$(TargetOutputDir)/" + SgenAssemblyFileName), Path.Combine(pluginDirectory, "ThirdParty/Mono/lib", PlatformString, SgenAssemblyFileName));

// Mono Assemblies
RuntimeDependencies.Add("$(TargetOutputDir)/...", Path.Combine(pluginDirectory, "ThirdParty/Mono/Assemblies/..."));
Expand All @@ -91,23 +104,28 @@ public Ink(ReadOnlyTargetRules Target) : base(Target)
void AddMonoRuntime(ReadOnlyTargetRules Target, string MonoUEPluginDirectory)
{
string MonoLibPath = MonoUEPluginDirectory + "/ThirdParty/Mono/lib/" + Target.Platform;

if (Target.Platform == UnrealTargetPlatform.Win64
|| Target.Platform == UnrealTargetPlatform.Win32)
string LibraryName = "";
if(Target.Platform == UnrealTargetPlatform.Win64 || Target.Platform == UnrealTargetPlatform.Win32)
{
string LibraryName = "mono-2.0-sgen";
LibraryName = "mono-2.0-sgen";
PublicAdditionalLibraries.Add(Path.Combine(MonoLibPath, LibraryName + ".lib"));
PublicDelayLoadDLLs.Add(LibraryName + ".dll");
}
else if (Target.Platform == UnrealTargetPlatform.Mac)
else if(Target.Platform == UnrealTargetPlatform.Mac)
{
string LibraryName = "libmonosgen-2.0";
LibraryName = "libmonosgen-2.0";
PublicAdditionalLibraries.Add("iconv");
PublicDelayLoadDLLs.Add(LibraryName + ".dylib");
}
else if(Target.Platform == UnrealTargetPlatform.Linux)
{
LibraryName = "libmonosgen-2.0";
PublicAdditionalLibraries.Add("iconv");
PublicDelayLoadDLLs.Add(LibraryName + ".so");
}
else
{
throw new BuildException("Mono not supported on platform '{0}'", Target.Platform);
throw new BuildException("Mono not supported on target platform '{0}'", Target.Platform);
}

PublicDefinitions.Add("MONO_IS_DYNAMIC_LIB=1");
Expand Down
Binary file added Plugins/UnrealInk/ThirdParty/Mono/lib/Linux/libmonosgen-2.0.so
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Plugins/UnrealInk/ThirdParty/Mono/lib/Linux/libmonosgen-2.0.so.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libmonosgen-2.0.so
1 change: 1 addition & 0 deletions Plugins/UnrealInk/ThirdParty/Mono/lib/Linux/libmonosgen-2.0.so.1.0.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libmonosgen-2.0.so.1
8 changes: 6 additions & 2 deletions Plugins/UnrealInk/UnrealInk.uplugin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
"LoadingPhase": "Default",
"WhitelistPlatforms": [
"Win64",
"Win32"
"Win32",
"Mac",
"Linux"
]
},
{
Expand All @@ -30,7 +32,9 @@
"LoadingPhase": "Default",
"WhitelistPlatforms": [
"Win64",
"Win32"
"Win32",
"Mac",
"Linux"
]
}
]
Expand Down