Browse code

fixes for mulle-bootstrap build

Nat! authored on 14-03-2016 13:43:35
Showing 2 changed files
... ...
@@ -169,13 +169,6 @@
169 169
 			);
170 170
 			runOnlyForDeploymentPostprocessing = 0;
171 171
 		};
172
-		41F14FE31B68F098002189F1 /* Frameworks */ = {
173
-			isa = PBXFrameworksBuildPhase;
174
-			buildActionMask = 2147483647;
175
-			files = (
176
-			);
177
-			runOnlyForDeploymentPostprocessing = 0;
178
-		};
179 172
 /* End PBXFrameworksBuildPhase section */
180 173
 
181 174
 /* Begin PBXGroup section */
... ...
@@ -359,9 +352,9 @@
359 352
 			isa = PBXNativeTarget;
360 353
 			buildConfigurationList = 41F14FE71B68F098002189F1 /* Build configuration list for PBXNativeTarget "mulle_concurrent" */;
361 354
 			buildPhases = (
355
+				411432171C96CEF8002F9F26 /* ShellScript */,
362 356
 				41F14FE21B68F098002189F1 /* Sources */,
363 357
 				4105ABF01BCB088A00D45AA8 /* Headers */,
364
-				41F14FE31B68F098002189F1 /* Frameworks */,
365 358
 			);
366 359
 			buildRules = (
367 360
 			);
... ...
@@ -424,6 +417,22 @@
424 417
 		};
425 418
 /* End PBXProject section */
426 419
 
420
+/* Begin PBXShellScriptBuildPhase section */
421
+		411432171C96CEF8002F9F26 /* ShellScript */ = {
422
+			isa = PBXShellScriptBuildPhase;
423
+			buildActionMask = 2147483647;
424
+			files = (
425
+			);
426
+			inputPaths = (
427
+			);
428
+			outputPaths = (
429
+			);
430
+			runOnlyForDeploymentPostprocessing = 0;
431
+			shellPath = /bin/sh;
432
+			shellScript = "echo \"${DEPENDENCY_SUBDIR}\"";
433
+		};
434
+/* End PBXShellScriptBuildPhase section */
435
+
427 436
 /* Begin PBXSourcesBuildPhase section */
428 437
 		41CAEAC01C8D9599003C2C7B /* Sources */ = {
429 438
 			isa = PBXSourcesBuildPhase;
... ...
@@ -533,10 +542,6 @@
533 542
 			isa = XCBuildConfiguration;
534 543
 			baseConfigurationReference = 41CAEADD1C8D982D003C2C7B /* DynamicLibraryOSX.xcconfig */;
535 544
 			buildSettings = {
536
-				LIBRARY_SEARCH_PATHS = (
537
-					"$(inherited)",
538
-					"$(PROJECT_DIR)/dependencies/lib/Debug",
539
-				);
540 545
 				OTHER_LDFLAGS = (
541 546
 					"-force_load",
542 547
 					"$(DEPENDENCIES_DIR)/lib/$(CONFIGURATION)/libmulle_test_allocator.a",
... ...
@@ -552,10 +557,6 @@
552 557
 			isa = XCBuildConfiguration;
553 558
 			baseConfigurationReference = 41CAEADD1C8D982D003C2C7B /* DynamicLibraryOSX.xcconfig */;
554 559
 			buildSettings = {
555
-				LIBRARY_SEARCH_PATHS = (
556
-					"$(inherited)",
557
-					"$(PROJECT_DIR)/dependencies/lib/Debug",
558
-				);
559 560
 				OTHER_LDFLAGS = (
560 561
 					"-force_load",
561 562
 					"$(DEPENDENCIES_DIR)/lib/$(CONFIGURATION)/libmulle_test_allocator.a",
562 563
new file mode 100644
... ...
@@ -0,0 +1,80 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<Scheme
3
+   LastUpgradeVersion = "0720"
4
+   version = "1.3">
5
+   <BuildAction
6
+      parallelizeBuildables = "YES"
7
+      buildImplicitDependencies = "YES">
8
+      <BuildActionEntries>
9
+         <BuildActionEntry
10
+            buildForTesting = "YES"
11
+            buildForRunning = "YES"
12
+            buildForProfiling = "YES"
13
+            buildForArchiving = "YES"
14
+            buildForAnalyzing = "YES">
15
+            <BuildableReference
16
+               BuildableIdentifier = "primary"
17
+               BlueprintIdentifier = "41CAEAC81C8D95A6003C2C7B"
18
+               BuildableName = "Libraries"
19
+               BlueprintName = "Libraries"
20
+               ReferencedContainer = "container:mulle-concurrent.xcodeproj">
21
+            </BuildableReference>
22
+         </BuildActionEntry>
23
+      </BuildActionEntries>
24
+   </BuildAction>
25
+   <TestAction
26
+      buildConfiguration = "Debug"
27
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29
+      shouldUseLaunchSchemeArgsEnv = "YES">
30
+      <Testables>
31
+      </Testables>
32
+      <AdditionalOptions>
33
+      </AdditionalOptions>
34
+   </TestAction>
35
+   <LaunchAction
36
+      buildConfiguration = "Debug"
37
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39
+      launchStyle = "0"
40
+      useCustomWorkingDirectory = "NO"
41
+      ignoresPersistentStateOnLaunch = "NO"
42
+      debugDocumentVersioning = "YES"
43
+      debugServiceExtension = "internal"
44
+      allowLocationSimulation = "YES">
45
+      <MacroExpansion>
46
+         <BuildableReference
47
+            BuildableIdentifier = "primary"
48
+            BlueprintIdentifier = "41CAEAC81C8D95A6003C2C7B"
49
+            BuildableName = "Libraries"
50
+            BlueprintName = "Libraries"
51
+            ReferencedContainer = "container:mulle-concurrent.xcodeproj">
52
+         </BuildableReference>
53
+      </MacroExpansion>
54
+      <AdditionalOptions>
55
+      </AdditionalOptions>
56
+   </LaunchAction>
57
+   <ProfileAction
58
+      buildConfiguration = "Release"
59
+      shouldUseLaunchSchemeArgsEnv = "YES"
60
+      savedToolIdentifier = ""
61
+      useCustomWorkingDirectory = "NO"
62
+      debugDocumentVersioning = "YES">
63
+      <MacroExpansion>
64
+         <BuildableReference
65
+            BuildableIdentifier = "primary"
66
+            BlueprintIdentifier = "41CAEAC81C8D95A6003C2C7B"
67
+            BuildableName = "Libraries"
68
+            BlueprintName = "Libraries"
69
+            ReferencedContainer = "container:mulle-concurrent.xcodeproj">
70
+         </BuildableReference>
71
+      </MacroExpansion>
72
+   </ProfileAction>
73
+   <AnalyzeAction
74
+      buildConfiguration = "Debug">
75
+   </AnalyzeAction>
76
+   <ArchiveAction
77
+      buildConfiguration = "Release"
78
+      revealArchiveInOrganizer = "YES">
79
+   </ArchiveAction>
80
+</Scheme>