From 5d06e68d45f49ff2d472847586af538a748bad8b Mon Sep 17 00:00:00 2001
From: Renaud Guillard <renaud@depinxi.be>
Date: Tue, 20 Oct 2020 11:08:00 +0200
Subject: [PATCH 1/2] xcode4 syslibdirs support

* Merge libdirs and syslibdirs to LIBRARY_SEARCH_PATHS setting
* Add test
---
 modules/xcode/tests/test_xcode_project.lua | 32 ++++++++++++++++++++++
 modules/xcode/xcode_common.lua             |  5 +++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/modules/xcode/tests/test_xcode_project.lua b/modules/xcode/tests/test_xcode_project.lua
index 8fdb0b6bae..c4d91204f7 100644
--- a/modules/xcode/tests/test_xcode_project.lua
+++ b/modules/xcode/tests/test_xcode_project.lua
@@ -2781,6 +2781,38 @@
 	end
 
 
+	function suite.XCBuildConfigurationProject_OnSysLibDirs()
+		libdirs { "mylibs1", "mylibs2" }
+		syslibdirs { "mysyslib3", "mysyslib4" }
+		prepare()
+		xcode.XCBuildConfiguration_Project(tr, tr.configs[1])
+		test.capture [[
+		A14350AC4595EE5E57CE36EC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
+				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					mylibs1,
+					mylibs2,
+					mysyslib3,
+					mysyslib4,
+				);
+				OBJROOT = obj/Debug;
+				ONLY_ACTIVE_ARCH = NO;
+				SYMROOT = bin/Debug;
+			};
+			name = Debug;
+		};
+		]]
+	end
+
+
 	function suite.XCBuildConfigurationProject_OnPCH()
 		pchheader "MyProject_Prefix.pch"
 		prepare()
diff --git a/modules/xcode/xcode_common.lua b/modules/xcode/xcode_common.lua
index ab3b9c9b77..d1369a5f2c 100644
--- a/modules/xcode/xcode_common.lua
+++ b/modules/xcode/xcode_common.lua
@@ -1375,7 +1375,10 @@
 		for i,v in ipairs(cfg.libdirs) do
 			cfg.libdirs[i] = p.project.getrelative(cfg.project, cfg.libdirs[i])
 		end
-		settings['LIBRARY_SEARCH_PATHS'] = cfg.libdirs
+		for i,v in ipairs(cfg.syslibdirs) do
+			cfg.syslibdirs[i] = p.project.getrelative(cfg.project, cfg.syslibdirs[i])
+		end
+		settings['LIBRARY_SEARCH_PATHS'] = table.join (cfg.libdirs, cfg.syslibdirs) 
 
 		for i,v in ipairs(cfg.frameworkdirs) do
 			cfg.frameworkdirs[i] = p.project.getrelative(cfg.project, cfg.frameworkdirs[i])

From dfb93e164042efc55ea150e6bd9f61644403b442 Mon Sep 17 00:00:00 2001
From: Renaud Guillard <renaud@depinxi.be>
Date: Fri, 23 Oct 2020 09:58:07 +0200
Subject: [PATCH 2/2] xcode4 sysincludedirs support update

* Use the new Xcode 9+ setting SYSTEM_HEADER_SEARCH_PATHS settings instead of HEADER_SEARCH_PATHS
* Update test
---
 modules/xcode/tests/test_xcode_project.lua | 8 ++++----
 modules/xcode/xcode_common.lua             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/xcode/tests/test_xcode_project.lua b/modules/xcode/tests/test_xcode_project.lua
index c4d91204f7..7fb3b35fdf 100644
--- a/modules/xcode/tests/test_xcode_project.lua
+++ b/modules/xcode/tests/test_xcode_project.lua
@@ -2255,15 +2255,15 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
+				OBJROOT = obj/Debug;
+				ONLY_ACTIVE_ARCH = NO;
+				SYMROOT = bin/Debug;
+				SYSTEM_HEADER_SEARCH_PATHS = (
 					../include,
 					../libs,
 					"\"../name with spaces\"",
 					"$(inherited)",
 				);
-				OBJROOT = obj/Debug;
-				ONLY_ACTIVE_ARCH = NO;
-				SYMROOT = bin/Debug;
 			};
 			name = Debug;
 		};
diff --git a/modules/xcode/xcode_common.lua b/modules/xcode/xcode_common.lua
index d1369a5f2c..7ab88c8547 100644
--- a/modules/xcode/xcode_common.lua
+++ b/modules/xcode/xcode_common.lua
@@ -1370,7 +1370,7 @@
 		if not table.isempty(cfg.sysincludedirs) then
 			table.insert(cfg.sysincludedirs, "$(inherited)")
 		end
-		settings['HEADER_SEARCH_PATHS'] = cfg.sysincludedirs
+		settings['SYSTEM_HEADER_SEARCH_PATHS'] = cfg.sysincludedirs
 
 		for i,v in ipairs(cfg.libdirs) do
 			cfg.libdirs[i] = p.project.getrelative(cfg.project, cfg.libdirs[i])