Skip to content

Commit 782cecb

Browse files
stefanceriustefanceriu
committed
Merge pull request #66 from E-B-Smith/master
Fixed build settings for differently named Xcode.app set-ups.
2 parents 0bc3bc9 + 09f6bfd commit 782cecb

File tree

1 file changed

+32
-34
lines changed

1 file changed

+32
-34
lines changed

‎SCXcodeMinimap.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
1819E4291AA1FB5900C344F2 /* SCXcodeMinimapScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1819E4281AA1FB5900C344F2 /* SCXcodeMinimapScrollView.m */; };
1212
184C11861A740F97002A7C65 /* SCXcodeMinimapSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 184C11821A740F97002A7C65 /* SCXcodeMinimapSelectionView.m */; };
1313
184C11871A740F97002A7C65 /* SCXcodeMinimapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 184C11841A740F97002A7C65 /* SCXcodeMinimapView.m */; };
14-
184C118F1A741136002A7C65 /* DVTFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 184C118E1A741136002A7C65 /* DVTFoundation.framework */; };
15-
1876135F1A77A74300974BE1 /* IDEKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1876135E1A77A74300974BE1 /* IDEKit.framework */; };
16-
1883080A1A7411830005DF40 /* DVTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 188308091A7411830005DF40 /* DVTKit.framework */; };
17-
188308101A7411A70005DF40 /* IDESourceEditor in Frameworks */ = {isa = PBXBuildFile; fileRef = 1883080F1A7411A70005DF40 /* IDESourceEditor */; };
1814
1889464D1B11DDEE0036175B /* SCXcodeMinimapTheme.m in Sources */ = {isa = PBXBuildFile; fileRef = 1889464C1B11DDEE0036175B /* SCXcodeMinimapTheme.m */; };
1915
188FCC8A1A98B57A0026F529 /* DBGBreakpointAnnotationProvider+SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 188FCC891A98B57A0026F529 /* DBGBreakpointAnnotationProvider+SCXcodeMinimap.m */; };
2016
18C2EA5C1A9C7F8A002CEB20 /* DBGBreakpointAnnotation+SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18C2EA5B1A9C7F8A002CEB20 /* DBGBreakpointAnnotation+SCXcodeMinimap.m */; };
21-
18C999FF1A98B04C0008AF54 /* DebuggerUI in Frameworks */ = {isa = PBXBuildFile; fileRef = 18C999FE1A98B04C0008AF54 /* DebuggerUI */; };
22-
18D6AD111A8F727B0082CB3F /* IDEFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18D6AD101A8F727B0082CB3F /* IDEFoundation.framework */; };
2317
18DE25ED1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18DE25EC1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.m */; };
2418
18E577FC1B119F6600421483 /* IDEIssueAnnotationProvider+SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18E577FB1B119F6600421483 /* IDEIssueAnnotationProvider+SCXcodeMinimap.m */; };
2519
18ECB80E1B13226500EE4D82 /* DVTLayoutManager+SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18ECB80D1B13226500EE4D82 /* DVTLayoutManager+SCXcodeMinimap.m */; };
2620
18ECB8111B1322A300EE4D82 /* SCXcodeMinimapCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 18ECB8101B1322A300EE4D82 /* SCXcodeMinimapCommon.m */; };
2721
18FE09B61707639E00118FEB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18FE09B51707639E00118FEB /* Cocoa.framework */; };
2822
18FE09C9170764E400118FEB /* SCXcodeMinimap.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FE09C8170764E400118FEB /* SCXcodeMinimap.m */; };
23+
2BDF45EF1B6EA50300EAC683 /* DVTFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF45EE1B6EA50300EAC683 /* DVTFoundation.framework */; };
24+
2BDF45F11B6EA51000EAC683 /* DVTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF45F01B6EA51000EAC683 /* DVTKit.framework */; };
25+
2BDF45F31B6EA54600EAC683 /* IDEFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF45F21B6EA54600EAC683 /* IDEFoundation.framework */; };
26+
2BDF45F51B6EA54E00EAC683 /* IDEKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF45F41B6EA54E00EAC683 /* IDEKit.framework */; };
27+
2BDF45FB1B6EAB5600EAC683 /* IDESourceEditor in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF45FA1B6EAB5600EAC683 /* IDESourceEditor */; };
28+
2BDF45FD1B6EAB8400EAC683 /* DebuggerUI in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF45FC1B6EAB8400EAC683 /* DebuggerUI */; };
2929
8742532317307161001C947C /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8742532217307161001C947C /* QuartzCore.framework */; };
3030
/* End PBXBuildFile section */
3131

@@ -62,12 +62,8 @@
6262
184C11821A740F97002A7C65 /* SCXcodeMinimapSelectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SCXcodeMinimapSelectionView.m; sourceTree = "<group>"; };
6363
184C11831A740F97002A7C65 /* SCXcodeMinimapView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SCXcodeMinimapView.h; sourceTree = "<group>"; };
6464
184C11841A740F97002A7C65 /* SCXcodeMinimapView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SCXcodeMinimapView.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
65-
184C118E1A741136002A7C65 /* DVTFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DVTFoundation.framework; path = /Applications/Xcode.app/Contents/SharedFrameworks/DVTFoundation.framework; sourceTree = "<group>"; };
6665
1876135D1A77A69F00974BE1 /* IDEEditorDocument.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = IDEEditorDocument.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
67-
1876135E1A77A74300974BE1 /* IDEKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IDEKit.framework; path = /Applications/Xcode.app/Contents/Frameworks/IDEKit.framework; sourceTree = "<group>"; };
6866
187EEF6A1A8F78C400E4EF39 /* IDEFileBreakpoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDEFileBreakpoint.h; sourceTree = "<group>"; };
69-
188308091A7411830005DF40 /* DVTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DVTKit.framework; path = /Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework; sourceTree = "<group>"; };
70-
1883080F1A7411A70005DF40 /* IDESourceEditor */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = IDESourceEditor; path = /Applications/Xcode.app/Contents/PlugIns/IDESourceEditor.ideplugin/Contents/MacOS/IDESourceEditor; sourceTree = "<group>"; };
7167
1889464B1B11DDEE0036175B /* SCXcodeMinimapTheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SCXcodeMinimapTheme.h; sourceTree = "<group>"; };
7268
1889464C1B11DDEE0036175B /* SCXcodeMinimapTheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SCXcodeMinimapTheme.m; sourceTree = "<group>"; };
7369
188D38761A98B26E005C7F85 /* DBGBreakpointAnnotation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DBGBreakpointAnnotation.h; sourceTree = "<group>"; };
@@ -82,9 +78,7 @@
8278
18C8F0341A7ECB1300C7A76F /* DVTLayoutManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTLayoutManager.h; sourceTree = "<group>"; };
8379
18C999FC1A98AF370008AF54 /* DBGBreakpointAnnotationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBGBreakpointAnnotationProvider.h; sourceTree = "<group>"; };
8480
18C999FD1A98AF580008AF54 /* DVTAnnotationProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DVTAnnotationProvider.h; sourceTree = "<group>"; };
85-
18C999FE1A98B04C0008AF54 /* DebuggerUI */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = DebuggerUI; path = /Applications/Xcode.app/Contents/PlugIns/DebuggerUI.ideplugin/Contents/MacOS/DebuggerUI; sourceTree = "<group>"; };
8681
18CA02B61A9D0DF1001C5CE1 /* IDEBreakpoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDEBreakpoint.h; sourceTree = "<group>"; };
87-
18D6AD101A8F727B0082CB3F /* IDEFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IDEFoundation.framework; path = /Applications/Xcode.app/Contents/Frameworks/IDEFoundation.framework; sourceTree = "<group>"; };
8882
18DE25EB1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "IDESourceCodeEditor+SCXcodeMinimap.h"; sourceTree = "<group>"; };
8983
18DE25EC1B202ACA00F3D380 /* IDESourceCodeEditor+SCXcodeMinimap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "IDESourceCodeEditor+SCXcodeMinimap.m"; sourceTree = "<group>"; };
9084
18DE6AFB1B203D070042615D /* DVTFindResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVTFindResult.h; sourceTree = "<group>"; };
@@ -108,6 +102,12 @@
108102
18FE09C7170764E400118FEB /* SCXcodeMinimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SCXcodeMinimap.h; sourceTree = "<group>"; };
109103
18FE09C8170764E400118FEB /* SCXcodeMinimap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SCXcodeMinimap.m; sourceTree = "<group>"; };
110104
18FEFA8C1A782D8600DC98C5 /* IDEFileTextSettings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDEFileTextSettings.h; sourceTree = "<group>"; };
105+
2BDF45EE1B6EA50300EAC683 /* DVTFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DVTFoundation.framework; path = ../SharedFrameworks/DVTFoundation.framework; sourceTree = DEVELOPER_DIR; };
106+
2BDF45F01B6EA51000EAC683 /* DVTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DVTKit.framework; path = ../SharedFrameworks/DVTKit.framework; sourceTree = DEVELOPER_DIR; };
107+
2BDF45F21B6EA54600EAC683 /* IDEFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IDEFoundation.framework; path = ../Frameworks/IDEFoundation.framework; sourceTree = DEVELOPER_DIR; };
108+
2BDF45F41B6EA54E00EAC683 /* IDEKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IDEKit.framework; path = ../Frameworks/IDEKit.framework; sourceTree = DEVELOPER_DIR; };
109+
2BDF45FA1B6EAB5600EAC683 /* IDESourceEditor */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = IDESourceEditor; path = ../PlugIns/IDESourceEditor.ideplugin/Contents/MacOS/IDESourceEditor; sourceTree = DEVELOPER_DIR; };
110+
2BDF45FC1B6EAB8400EAC683 /* DebuggerUI */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = DebuggerUI; path = ../PlugIns/DebuggerUI.ideplugin/Contents/MacOS/DebuggerUI; sourceTree = DEVELOPER_DIR; };
111111
8742532217307161001C947C /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
112112
/* End PBXFileReference section */
113113

@@ -116,14 +116,14 @@
116116
isa = PBXFrameworksBuildPhase;
117117
buildActionMask = 2147483647;
118118
files = (
119-
188308101A7411A70005DF40 /* IDESourceEditor in Frameworks */,
120-
184C118F1A741136002A7C65 /* DVTFoundation.framework in Frameworks */,
119+
2BDF45F51B6EA54E00EAC683 /* IDEKit.framework in Frameworks */,
120+
2BDF45F11B6EA51000EAC683 /* DVTKit.framework in Frameworks */,
121+
2BDF45EF1B6EA50300EAC683 /* DVTFoundation.framework in Frameworks */,
121122
8742532317307161001C947C /* QuartzCore.framework in Frameworks */,
122-
1883080A1A7411830005DF40 /* DVTKit.framework in Frameworks */,
123-
1876135F1A77A74300974BE1 /* IDEKit.framework in Frameworks */,
124-
18C999FF1A98B04C0008AF54 /* DebuggerUI in Frameworks */,
123+
2BDF45F31B6EA54600EAC683 /* IDEFoundation.framework in Frameworks */,
124+
2BDF45FD1B6EAB8400EAC683 /* DebuggerUI in Frameworks */,
125+
2BDF45FB1B6EAB5600EAC683 /* IDESourceEditor in Frameworks */,
125126
18FE09B61707639E00118FEB /* Cocoa.framework in Frameworks */,
126-
18D6AD111A8F727B0082CB3F /* IDEFoundation.framework in Frameworks */,
127127
);
128128
runOnlyForDeploymentPostprocessing = 0;
129129
};
@@ -201,13 +201,13 @@
201201
18FE09B81707639E00118FEB /* AppKit.framework */,
202202
18FE09B51707639E00118FEB /* Cocoa.framework */,
203203
18FE09B91707639E00118FEB /* CoreData.framework */,
204-
18C999FE1A98B04C0008AF54 /* DebuggerUI */,
205-
184C118E1A741136002A7C65 /* DVTFoundation.framework */,
206-
188308091A7411830005DF40 /* DVTKit.framework */,
204+
2BDF45EE1B6EA50300EAC683 /* DVTFoundation.framework */,
205+
2BDF45F01B6EA51000EAC683 /* DVTKit.framework */,
207206
18FE09BA1707639E00118FEB /* Foundation.framework */,
208-
18D6AD101A8F727B0082CB3F /* IDEFoundation.framework */,
209-
1876135E1A77A74300974BE1 /* IDEKit.framework */,
210-
1883080F1A7411A70005DF40 /* IDESourceEditor */,
207+
2BDF45FC1B6EAB8400EAC683 /* DebuggerUI */,
208+
2BDF45F21B6EA54600EAC683 /* IDEFoundation.framework */,
209+
2BDF45F41B6EA54E00EAC683 /* IDEKit.framework */,
210+
2BDF45FA1B6EAB5600EAC683 /* IDESourceEditor */,
211211
8742532217307161001C947C /* QuartzCore.framework */,
212212
);
213213
name = Frameworks;
@@ -399,9 +399,9 @@
399399
FRAMEWORK_SEARCH_PATHS = (
400400
"$(inherited)",
401401
"$(PROJECT_DIR)",
402-
"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/SharedFrameworks",
403-
"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Frameworks",
404-
"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/OtherFrameworks",
402+
"$(SYSTEM_DEVELOPER_DIR)/../SharedFrameworks",
403+
"$(SYSTEM_DEVELOPER_DIR)/../Frameworks",
404+
"$(SYSTEM_DEVELOPER_DIR)/../OtherFrameworks",
405405
);
406406
GCC_ENABLE_OBJC_GC = "";
407407
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -410,8 +410,7 @@
410410
INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
411411
LIBRARY_SEARCH_PATHS = (
412412
"$(inherited)",
413-
"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/PlugIns/IDESourceEditor.ideplugin/Contents/MacOS",
414-
"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/PlugIns/DebuggerUI.ideplugin/Contents/MacOS",
413+
"$(SYSTEM_DEVELOPER_DIR)/../Plugins/**",
415414
);
416415
PRODUCT_NAME = "$(TARGET_NAME)";
417416
WRAPPER_EXTENSION = xcplugin;
@@ -428,9 +427,9 @@
428427
FRAMEWORK_SEARCH_PATHS = (
429428
"$(inherited)",
430429
"$(PROJECT_DIR)",
431-
"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/SharedFrameworks",
432-
"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Frameworks",
433-
"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/OtherFrameworks",
430+
"$(SYSTEM_DEVELOPER_DIR)/../SharedFrameworks",
431+
"$(SYSTEM_DEVELOPER_DIR)/../Frameworks",
432+
"$(SYSTEM_DEVELOPER_DIR)/../OtherFrameworks",
434433
);
435434
GCC_ENABLE_OBJC_GC = "";
436435
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -439,8 +438,7 @@
439438
INSTALL_PATH = "/Library/Application Support/Developer/Shared/Xcode/Plug-ins";
440439
LIBRARY_SEARCH_PATHS = (
441440
"$(inherited)",
442-
"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/PlugIns/IDESourceEditor.ideplugin/Contents/MacOS",
443-
"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/PlugIns/DebuggerUI.ideplugin/Contents/MacOS",
441+
"$(SYSTEM_DEVELOPER_DIR)/../Plugins/**",
444442
);
445443
PRODUCT_NAME = "$(TARGET_NAME)";
446444
WRAPPER_EXTENSION = xcplugin;

0 commit comments

Comments
 (0)