Merge branch 'saudi/xcode-allow-link-with-full-lib-path' into 'main'

XCode: Allow forcing linking a library without "-l", using regular input file See merge request Sharpmake/sharpmake!535
ubisoft · Jul 24, 2024 · 2df8e3a · 2df8e3a
2 parents 96ff49b + 0d4f3f4
commit 2df8e3a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 28 deletions.
diff --git a/Sharpmake.Generators/Apple/XCodeProj.cs b/Sharpmake.Generators/Apple/XCodeProj.cs
@@ -1501,17 +1501,25 @@ private Options.ExplicitOptions GenerateOptions(XCodeGenerationContext context)
             // linker(ld) of Xcode: only accept libfilename without prefix and suffix.
             linkerOptions.AddRange(libFiles.Select(library =>
             {
+                bool hasLibraryExtension = Path.HasExtension(library) &&
+                    ((Path.GetExtension(library).EndsWith(".a", StringComparison.OrdinalIgnoreCase) ||
+                      Path.GetExtension(library).EndsWith(".dylib", StringComparison.OrdinalIgnoreCase)
+                    ));
+
                 // deal with full library path: add libdir and libname
                 if (Path.IsPathFullyQualified(library))
                 {
+                    // Special case with full path: pass them as is.
+                    // This is to leave the possibility to force the extension,
+                    // preventing conflict if the folder contains both .a and .dylib version.
+                    if (hasLibraryExtension)
+                        return library;
+
                     conf.LibraryPaths.Add(Path.GetDirectoryName(library));
                     library = Path.GetFileName(library);
                 }
 
-                if (Path.HasExtension(library) &&
-                    ((Path.GetExtension(library).EndsWith(".a", StringComparison.OrdinalIgnoreCase) ||
-                      Path.GetExtension(library).EndsWith(".dylib", StringComparison.OrdinalIgnoreCase)
-                    )))
+                if (hasLibraryExtension)
                 {
                     library = Path.GetFileNameWithoutExtension(library);
                     if (library.StartsWith("lib"))

diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/BaseApplePlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Apple/BaseApplePlatform.cs
@@ -360,21 +360,10 @@ public void SetupDynamicLibraryPaths(Project.Configuration configuration, Depend
                             dependency.TargetFileFullNameWithExtension,
                         dependency.TargetFileOrderNumber);
             }
-            else if (dependency.Project.SharpmakeProjectType == Project.ProjectTypeAttribute.Export && configuration.IsFastBuild)
-            {
-                if (dependencySetting.HasFlag(DependencySetting.LibraryFiles))
-                    configuration.AddDependencyBuiltTargetLibraryFile(Path.Combine(dependency.TargetLibraryPath, dependency.TargetFileFullNameWithExtension), dependency.TargetFileOrderNumber);
-            }
             else
             {
-                if (dependencySetting.HasFlag(DependencySetting.LibraryPaths))
-                    configuration.DependenciesOtherLibraryPaths.Add(dependency.TargetPath, dependency.TargetLibraryPathOrderNumber);
                 if (dependencySetting.HasFlag(DependencySetting.LibraryFiles))
-                    configuration.DependenciesOtherLibraryFiles.Add(
-                        dependency.PreferRelativePaths ?
-                            dependency.TargetFileName :
-                            dependency.TargetFileFullNameWithExtension,
-                        dependency.TargetFileOrderNumber);
+                    configuration.AddDependencyBuiltTargetLibraryFile(Path.Combine(dependency.TargetLibraryPath, dependency.TargetFileFullNameWithExtension), dependency.TargetFileOrderNumber);
             }
         }
 
@@ -392,21 +381,10 @@ public void SetupStaticLibraryPaths(Project.Configuration configuration, Depende
                             dependency.TargetFileFullNameWithExtension,
                         dependency.TargetFileOrderNumber);
             }
-            else if (dependency.Project.SharpmakeProjectType == Project.ProjectTypeAttribute.Export && configuration.IsFastBuild)
-            {
-                if (dependencySetting.HasFlag(DependencySetting.LibraryFiles))
-                    configuration.DependenciesOtherLibraryFiles.Add(Path.Combine(dependency.TargetLibraryPath, dependency.TargetFileFullNameWithExtension), dependency.TargetFileOrderNumber);
-            }
             else
             {
-                if (dependencySetting.HasFlag(DependencySetting.LibraryPaths))
-                    configuration.DependenciesOtherLibraryPaths.Add(dependency.TargetLibraryPath, dependency.TargetLibraryPathOrderNumber);
                 if (dependencySetting.HasFlag(DependencySetting.LibraryFiles))
-                    configuration.DependenciesOtherLibraryFiles.Add(
-                        dependency.PreferRelativePaths ?
-                            dependency.TargetFileName :
-                            dependency.TargetFileFullNameWithExtension,
-                        dependency.TargetFileOrderNumber);
+                    configuration.DependenciesOtherLibraryFiles.Add(Path.Combine(dependency.TargetLibraryPath, dependency.TargetFileFullNameWithExtension), dependency.TargetFileOrderNumber);
             }
         }