Skip to content
Permalink
Browse files

Fix command line builds and remove incorrect framework paths.

  • Loading branch information...
stuconnolly committed Oct 12, 2018
1 parent 4a11a33 commit cfd792488ae78c3bad3abdc86b8449e43e4adefd
Showing with 14 additions and 26 deletions.
  1. +3 −3 Makefile
  2. +11 −23 sequel-pro.xcodeproj/project.pbxproj
@@ -9,7 +9,7 @@ RM=rm
.PHONY: sequel-pro test analyze clean localize

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

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

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

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

@@ -3749,7 +3749,6 @@
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
PRODUCT_NAME = Localize;
ZERO_LINK = NO;
};
@@ -3797,7 +3796,6 @@
buildSettings = {
BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Sequel Pro.app/Contents/MacOS/Sequel Pro";
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/Frameworks",
"$(inherited)",
@@ -4041,7 +4039,6 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
@@ -4078,10 +4075,7 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/Frameworks",
"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Debug",
);
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Frameworks";
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -4102,10 +4096,7 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/Frameworks",
"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Release",
);
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Frameworks";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch";
@@ -4124,10 +4115,7 @@
58CDB33A0FCE13CB00F8ACA3 /* Distribution */ = {
isa = XCBuildConfiguration;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(BUILD_DIR)/Frameworks",
"$(SRCROOT)/Frameworks/SPMySQLFramework/build/Distribution",
);
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/Frameworks";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch";
@@ -4307,7 +4295,7 @@
1798AB1F12676EA0000D946A /* Distribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
defaultConfigurationName = Debug;
};
380F4EDE0FC0B50600B0BFD7 /* Build configuration list for PBXNativeTarget "Unit Tests" */ = {
isa = XCConfigurationList;
@@ -4317,7 +4305,7 @@
380F4EDD0FC0B50600B0BFD7 /* Distribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
defaultConfigurationName = Debug;
};
584754C7120A04560057631F /* Build configuration list for PBXNativeTarget "Sequel Pro QLGenerator" */ = {
isa = XCConfigurationList;
@@ -4327,7 +4315,7 @@
584754C6120A04560057631F /* Distribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
defaultConfigurationName = Debug;
};
58B906EB11BD989A000826E5 /* Build configuration list for PBXNativeTarget "PSMTabBar" */ = {
isa = XCConfigurationList;
@@ -4337,7 +4325,7 @@
58B906EA11BD989A000826E5 /* Distribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
defaultConfigurationName = Debug;
};
58B9096A11C3A431000826E5 /* Build configuration list for PBXNativeTarget "xibLocalizationPostprocessor" */ = {
isa = XCConfigurationList;
@@ -4347,7 +4335,7 @@
58B9096511C3A42C000826E5 /* Distribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
defaultConfigurationName = Debug;
};
58CDB33F0FCE13E300F8ACA3 /* Build configuration list for PBXNativeTarget "SequelProTunnelAssistant" */ = {
isa = XCConfigurationList;
@@ -4357,7 +4345,7 @@
58CDB33A0FCE13CB00F8ACA3 /* Distribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
defaultConfigurationName = Debug;
};
C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "Sequel Pro" */ = {
isa = XCConfigurationList;
@@ -4367,7 +4355,7 @@
588593F10F7AEB6900ED0E67 /* Distribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
defaultConfigurationName = Debug;
};
C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "sequel-pro" */ = {
isa = XCConfigurationList;
@@ -4377,7 +4365,7 @@
588593F00F7AEB6900ED0E67 /* Distribution */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
defaultConfigurationName = Debug;
};
/* End XCConfigurationList section */
};

0 comments on commit cfd7924

Please sign in to comment.
You can’t perform that action at this time.