From 509db2bea026360e578e55a9a122af446d2b1720 Mon Sep 17 00:00:00 2001 From: David Holloway Date: Fri, 30 Sep 2016 11:01:22 -0700 Subject: [PATCH 1/2] fix for Target.Platform == Linux --- .../MySQLConnectorUE4Plugin.Build.cs | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/Source/MySQLConnectorUE4Plugin/MySQLConnectorUE4Plugin.Build.cs b/Source/MySQLConnectorUE4Plugin/MySQLConnectorUE4Plugin.Build.cs index 296cc10..262a0ab 100644 --- a/Source/MySQLConnectorUE4Plugin/MySQLConnectorUE4Plugin.Build.cs +++ b/Source/MySQLConnectorUE4Plugin/MySQLConnectorUE4Plugin.Build.cs @@ -5,27 +5,23 @@ public class MySQLConnectorUE4Plugin : ModuleRules { public MySQLConnectorUE4Plugin(TargetInfo Target) { - //File.WriteAllText("c:/temp/qqq.txt", this.GetType().Name); - //string ModulePath = Path.GetDirectoryName( RulesAssembly.GetModuleFilename( this.GetType().Name ) ); - UEBuildConfiguration.bForceEnableExceptions = true; - - RulesAssembly r; - FileReference CheckProjectFile; - UProjectInfo.TryGetProjectForTarget("MyGame", out CheckProjectFile); + FileReference CheckProjectFile; + UProjectInfo.TryGetProjectForTarget("MyGame", out CheckProjectFile); - r = RulesCompiler.CreateProjectRulesAssembly(CheckProjectFile); - FileReference f = r.GetModuleFileName( this.GetType().Name ); - //File.WriteAllText("c:/temp/qqq2.txt", f.CanonicalName ); - - string ModulePath = Path.GetDirectoryName( f.CanonicalName ); - string PlatformString = (Target.Platform == UnrealTargetPlatform.Win64) ? "x64" : "x86"; + string ModulePath = this.ModuleDirectory; string ThirdPartyPath = Path.GetFullPath( Path.Combine( ModulePath, "../../ThirdParty/" ) ); - - string LibrariesPath = Path.Combine(ThirdPartyPath, "MySQLConnector", "Lib"); + string LibrariesPath = Path.Combine(ThirdPartyPath, "MySQLConnector", "Lib"); + + if (Target.Platform == UnrealTargetPlatform.Win64 || Target.Platform == UnrealTargetPlatform.Win32) { + string PlatformString = (Target.Platform == UnrealTargetPlatform.Win64) ? "x64" : "x86"; + string LibraryName = Path.Combine(LibrariesPath, "mariadbclient." + PlatformString + ".lib"); + PublicAdditionalLibraries.Add(LibraryName); + } else if (Target.Platform == UnrealTargetPlatform.Linux) { + string LibraryName = Path.Combine(LibrariesPath, "libmariadbclient.a"); + PublicAdditionalLibraries.Add(LibraryName); + } - string LibraryName = Path.Combine(LibrariesPath, "mariadbclient." + PlatformString + ".lib"); - PublicAdditionalLibraries.Add(LibraryName); PrivateIncludePaths.AddRange(new string[] { "MySQLConnectorUE4Plugin/Private" }); PublicIncludePaths.AddRange(new string[] { "MySQLConnectorUE4Plugin/Public" }); From 22b5d2cfe152091ed2ff000453531117236d8533 Mon Sep 17 00:00:00 2001 From: David Holloway Date: Fri, 30 Sep 2016 16:55:15 -0700 Subject: [PATCH 2/2] fix for Target.Platform == Linux --- .../MySQLConnectorUE4Plugin/MySQLConnectorUE4Plugin.Build.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/MySQLConnectorUE4Plugin/MySQLConnectorUE4Plugin.Build.cs b/Source/MySQLConnectorUE4Plugin/MySQLConnectorUE4Plugin.Build.cs index 262a0ab..1f581bb 100644 --- a/Source/MySQLConnectorUE4Plugin/MySQLConnectorUE4Plugin.Build.cs +++ b/Source/MySQLConnectorUE4Plugin/MySQLConnectorUE4Plugin.Build.cs @@ -6,8 +6,6 @@ public class MySQLConnectorUE4Plugin : ModuleRules public MySQLConnectorUE4Plugin(TargetInfo Target) { UEBuildConfiguration.bForceEnableExceptions = true; - FileReference CheckProjectFile; - UProjectInfo.TryGetProjectForTarget("MyGame", out CheckProjectFile); string ModulePath = this.ModuleDirectory; string ThirdPartyPath = Path.GetFullPath( Path.Combine( ModulePath, "../../ThirdParty/" ) ); @@ -34,4 +32,4 @@ public MySQLConnectorUE4Plugin(TargetInfo Target) PublicDependencyModuleNames.AddRange(new string[] { "Engine", "Core", "CoreUObject" }); } -} \ No newline at end of file +}