Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 04:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move OS X pcre2.h into a new directory shared_headers

Browse source 
Allows fish and pcre2 project to both find the header,
without their respective config.h files interfering with
each other.
This commit is contained in:
ridiculousfish 2015-09-26 15:01:46 -07:00
parent de3cb6b374
commit c30de8add4
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
fish.xcodeproj/project.pbxproj
View file

@ -1480,6 +1480,7 @@
D007FDDA17136EAA00A52BE6 /* Release_C++11 */ = { D007FDDA17136EAA00A52BE6 /* Release_C++11 */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
@ -1502,7 +1503,7 @@
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7; MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx; SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx"; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx $(SRCROOT)/osx/shared_headers";
WARNING_CFLAGS = ( WARNING_CFLAGS = (
"-Wall", "-Wall",
"-Wunused-macros", "-Wunused-macros",
@ -1550,13 +1551,11 @@
D007FDDE17136EAA00A52BE6 /* Release_C++11 */ = { D007FDDE17136EAA00A52BE6 /* Release_C++11 */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
PRODUCT_NAME = fish; PRODUCT_NAME = fish;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2";
}; };
name = "Release_C++11"; name = "Release_C++11";
}; };
@ -1569,7 +1568,6 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2";
}; };
name = "Release_C++11"; name = "Release_C++11";
}; };
@ -1614,7 +1612,8 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_UNUSED_VARIABLE = NO; GCC_WARN_UNUSED_VARIABLE = NO;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2"; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2 $(SRCROOT)/osx/shared_headers/";
USE_HEADERMAP = NO;
WARNING_CFLAGS = ""; WARNING_CFLAGS = "";
}; };
name = Debug; name = Debug;
@ -1638,7 +1637,8 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_UNUSED_VARIABLE = NO; GCC_WARN_UNUSED_VARIABLE = NO;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2"; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2 $(SRCROOT)/osx/shared_headers/";
USE_HEADERMAP = NO;
WARNING_CFLAGS = ""; WARNING_CFLAGS = "";
}; };
name = Release; name = Release;
@ -1662,7 +1662,8 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_UNUSED_VARIABLE = NO; GCC_WARN_UNUSED_VARIABLE = NO;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2"; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2 $(SRCROOT)/osx/shared_headers/";
USE_HEADERMAP = NO;
WARNING_CFLAGS = ""; WARNING_CFLAGS = "";
}; };
name = "Release_C++11"; name = "Release_C++11";
@ -1690,6 +1691,7 @@
D0A084F813B3AC130099B651 /* Debug */ = { D0A084F813B3AC130099B651 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_EXCEPTIONS = NO;
GCC_ENABLE_CPP_RTTI = YES; GCC_ENABLE_CPP_RTTI = YES;
@ -1712,7 +1714,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.6; MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx; SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx"; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx $(SRCROOT)/osx/shared_headers";
WARNING_CFLAGS = ( WARNING_CFLAGS = (
"-Wall", "-Wall",
"-Wunused-macros", "-Wunused-macros",
@ -1723,6 +1725,7 @@
D0A084F913B3AC130099B651 /* Release */ = { D0A084F913B3AC130099B651 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
DEAD_CODE_STRIPPING = YES; DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_EXCEPTIONS = NO;
@ -1743,7 +1746,7 @@
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6; MACOSX_DEPLOYMENT_TARGET = 10.6;
SDKROOT = macosx; SDKROOT = macosx;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx"; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx $(SRCROOT)/osx/shared_headers";
WARNING_CFLAGS = ( WARNING_CFLAGS = (
"-Wall", "-Wall",
"-Wunused-macros", "-Wunused-macros",
@ -1849,7 +1852,6 @@
); );
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2";
}; };
name = Debug; name = Debug;
}; };
@ -1862,33 +1864,28 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2";
}; };
name = Release; name = Release;
}; };
D0D26944159835CA005D9B9C /* Debug */ = { D0D26944159835CA005D9B9C /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
PRODUCT_NAME = fish; PRODUCT_NAME = fish;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2";
}; };
name = Debug; name = Debug;
}; };
D0D26945159835CA005D9B9C /* Release */ = { D0D26945159835CA005D9B9C /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
PRODUCT_NAME = fish; PRODUCT_NAME = fish;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/osx/pcre2";
}; };
name = Release; name = Release;
}; };

0
osx/pcre2.h → osx/shared_headers/pcre2.h
View file