Commits

Julien Hamaide committed 8c38dff Merge

Merge fc98f94

Comments (0)

Files changed (3)

 * Patch 3505903: Fix VC2010 project reference paths (Pavel Czerný)
 * Patch 3305599: Add -Wextra to ExtraWarnings (ergosys)
 * Patch 3476176: Fix dependencies of precompiled header in makefile (Konstantin Tokarev)
+* Patch 3476176: Remove conditionals from makefile compiler assignments (Konstantin Tokarev)
+* Pull 1: Fixed path to Info.plist in Xcode projects (Adrien Anselme)
 
 
 -------

src/actions/xcode/xcode_common.lua

File contents unchanged.

tests/actions/xcode/test_xcode_project.lua

 	end
 
 	function suite.XCBuildConfigurationTarget_OnInfoPlist()
-		files { "MyProject-Info.plist" }
+		files { "../../MyProject-Info.plist" }
 		prepare()
 		xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1])
 		test.capture [[
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_MODEL_TUNING = G5;
-				INFOPLIST_FILE = "MyProject-Info.plist";
+				INFOPLIST_FILE = "../../MyProject-Info.plist";
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = "MyProject";
 			};