Skip to content

Commit cfd7924

Browse files
committed
Fix command line builds and remove incorrect framework paths.
1 parent 4a11a33 commit cfd7924

File tree

2 files changed

+14
-26
lines changed

2 files changed

+14
-26
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RM=rm
99
.PHONY: sequel-pro test analyze clean localize
1010

1111
sequel-pro:
12-
xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" $(OPTIONS) build
12+
xcodebuild -project sequel-pro.xcodeproj -scheme "Sequel Pro" -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" $(OPTIONS) build
1313

1414
test:
1515
xcodebuild -project sequel-pro.xcodeproj -scheme "Sequel Pro" -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" $(OPTIONS) test
@@ -18,8 +18,8 @@ analyze:
1818
xcodebuild -project sequel-pro.xcodeproj -scheme "Sequel Pro" -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" $(OPTIONS) analyze
1919

2020
clean:
21-
xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" $(OPTIONS) clean
21+
xcodebuild -project sequel-pro.xcodeproj -scheme "Sequel Pro" -configuration "$(BUILD_CONFIG)" $(OPTIONS) clean
2222

2323
localize:
24-
xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" $(OPTIONS) -target Localize
24+
xcodebuild -project sequel-pro.xcodeproj -scheme "Sequel Pro" -configuration "$(BUILD_CONFIG)" $(OPTIONS) -target Localize
2525

sequel-pro.xcodeproj/project.pbxproj

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3749,7 +3749,6 @@
37493749
buildSettings = {
37503750
COMBINE_HIDPI_IMAGES = YES;
37513751
COPY_PHASE_STRIP = YES;
3752-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
37533752
PRODUCT_NAME = Localize;
37543753
ZERO_LINK = NO;
37553754
};
@@ -3797,7 +3796,6 @@
37973796
buildSettings = {
37983797
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Sequel Pro.app/Contents/MacOS/Sequel Pro";
37993798
COMBINE_HIDPI_IMAGES = YES;
3800-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
38013799
FRAMEWORK_SEARCH_PATHS = (
38023800
"$(SRCROOT)/Frameworks",
38033801
"$(inherited)",
@@ -4041,7 +4039,6 @@
40414039
isa = XCBuildConfiguration;
40424040
buildSettings = {
40434041
COPY_PHASE_STRIP = YES;
4044-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
40454042
GCC_MODEL_TUNING = G5;
40464043
GCC_PRECOMPILE_PREFIX_HEADER = YES;
40474044
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
@@ -4078,10 +4075,7 @@
40784075
isa = XCBuildConfiguration;
40794076
buildSettings = {
40804077
COPY_PHASE_STRIP = NO;
4081-
FRAMEWORK_SEARCH_PATHS = (
4082-
"$(SRCROOT)/Frameworks",
4083-
"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Debug",
4084-
);
4078+
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Frameworks";
40854079
GCC_DYNAMIC_NO_PIC = NO;
40864080
GCC_MODEL_TUNING = G5;
40874081
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -4102,10 +4096,7 @@
41024096
buildSettings = {
41034097
COPY_PHASE_STRIP = YES;
41044098
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
4105-
FRAMEWORK_SEARCH_PATHS = (
4106-
"$(SRCROOT)/Frameworks",
4107-
"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Release",
4108-
);
4099+
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Frameworks";
41094100
GCC_MODEL_TUNING = G5;
41104101
GCC_PRECOMPILE_PREFIX_HEADER = YES;
41114102
GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch";
@@ -4124,10 +4115,7 @@
41244115
58CDB33A0FCE13CB00F8ACA3 /* Distribution */ = {
41254116
isa = XCBuildConfiguration;
41264117
buildSettings = {
4127-
FRAMEWORK_SEARCH_PATHS = (
4128-
"$(BUILD_DIR)/Frameworks",
4129-
"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Distribution",
4130-
);
4118+
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Frameworks";
41314119
GCC_MODEL_TUNING = G5;
41324120
GCC_PRECOMPILE_PREFIX_HEADER = YES;
41334121
GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch";
@@ -4307,7 +4295,7 @@
43074295
1798AB1F12676EA0000D946A /* Distribution */,
43084296
);
43094297
defaultConfigurationIsVisible = 0;
4310-
defaultConfigurationName = Release;
4298+
defaultConfigurationName = Debug;
43114299
};
43124300
380F4EDE0FC0B50600B0BFD7 /* Build configuration list for PBXNativeTarget "Unit Tests" */ = {
43134301
isa = XCConfigurationList;
@@ -4317,7 +4305,7 @@
43174305
380F4EDD0FC0B50600B0BFD7 /* Distribution */,
43184306
);
43194307
defaultConfigurationIsVisible = 0;
4320-
defaultConfigurationName = Release;
4308+
defaultConfigurationName = Debug;
43214309
};
43224310
584754C7120A04560057631F /* Build configuration list for PBXNativeTarget "Sequel Pro QLGenerator" */ = {
43234311
isa = XCConfigurationList;
@@ -4327,7 +4315,7 @@
43274315
584754C6120A04560057631F /* Distribution */,
43284316
);
43294317
defaultConfigurationIsVisible = 0;
4330-
defaultConfigurationName = Release;
4318+
defaultConfigurationName = Debug;
43314319
};
43324320
58B906EB11BD989A000826E5 /* Build configuration list for PBXNativeTarget "PSMTabBar" */ = {
43334321
isa = XCConfigurationList;
@@ -4337,7 +4325,7 @@
43374325
58B906EA11BD989A000826E5 /* Distribution */,
43384326
);
43394327
defaultConfigurationIsVisible = 0;
4340-
defaultConfigurationName = Release;
4328+
defaultConfigurationName = Debug;
43414329
};
43424330
58B9096A11C3A431000826E5 /* Build configuration list for PBXNativeTarget "xibLocalizationPostprocessor" */ = {
43434331
isa = XCConfigurationList;
@@ -4347,7 +4335,7 @@
43474335
58B9096511C3A42C000826E5 /* Distribution */,
43484336
);
43494337
defaultConfigurationIsVisible = 0;
4350-
defaultConfigurationName = Release;
4338+
defaultConfigurationName = Debug;
43514339
};
43524340
58CDB33F0FCE13E300F8ACA3 /* Build configuration list for PBXNativeTarget "SequelProTunnelAssistant" */ = {
43534341
isa = XCConfigurationList;
@@ -4357,7 +4345,7 @@
43574345
58CDB33A0FCE13CB00F8ACA3 /* Distribution */,
43584346
);
43594347
defaultConfigurationIsVisible = 0;
4360-
defaultConfigurationName = Release;
4348+
defaultConfigurationName = Debug;
43614349
};
43624350
C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "Sequel Pro" */ = {
43634351
isa = XCConfigurationList;
@@ -4367,7 +4355,7 @@
43674355
588593F10F7AEB6900ED0E67 /* Distribution */,
43684356
);
43694357
defaultConfigurationIsVisible = 0;
4370-
defaultConfigurationName = Release;
4358+
defaultConfigurationName = Debug;
43714359
};
43724360
C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "sequel-pro" */ = {
43734361
isa = XCConfigurationList;
@@ -4377,7 +4365,7 @@
43774365
588593F00F7AEB6900ED0E67 /* Distribution */,
43784366
);
43794367
defaultConfigurationIsVisible = 0;
4380-
defaultConfigurationName = Release;
4368+
defaultConfigurationName = Debug;
43814369
};
43824370
/* End XCConfigurationList section */
43834371
};

0 commit comments

Comments
 (0)