From cd9a4c6c3264d4d26b58e5da9b397d3f3bbab66a Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Thu, 8 Sep 2011 22:53:15 +0200 Subject: On Mac OS X, add /opt/homebrew/{include,lib} to header and library search paths. --- Toilet Lisp.xcodeproj/project.pbxproj | 337 ++++++++++++++++++++++------------ configure | 4 +- 2 files changed, 219 insertions(+), 122 deletions(-) diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj index 0a7e97a..1c9ca0b 100644 --- a/Toilet Lisp.xcodeproj/project.pbxproj +++ b/Toilet Lisp.xcodeproj/project.pbxproj @@ -907,9 +907,16 @@ /* Begin PBXProject section */ A7E5C3CE0E21682800A01D81 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0410; + }; buildConfigurationList = A7E5C3CF0E21682800A01D81 /* Build configuration list for PBXProject "Toilet Lisp" */; compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; hasScannedForEncodings = 0; + knownRegions = ( + en, + ); mainGroup = A7E5C3CC0E21682800A01D81; productRefGroup = A7E5C3E00E21684000A01D81 /* Products */; projectDirPath = ""; @@ -1064,7 +1071,6 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = G5; @@ -1074,7 +1080,10 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; INFOPLIST_FILE = "Toilet Lisp-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1111,9 +1120,8 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = "Toilet Lisp"; - USER_HEADER_SEARCH_PATHS = /opt/local/include; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; }; @@ -1122,7 +1130,6 @@ A72BC6F30E65DE4900486804 /* Debug 10.4+ (fast) */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1130,7 +1137,10 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; INFOPLIST_FILE = "Toilet Lisp-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1167,9 +1177,8 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = "Toilet Lisp"; - USER_HEADER_SEARCH_PATHS = /opt/local/include; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; WRAPPER_EXTENSION = app; ZERO_LINK = YES; }; @@ -1178,7 +1187,6 @@ A72BC6F40E65DE4900486804 /* Debug 10.4+ (fast + GC) */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; @@ -1187,7 +1195,10 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; INFOPLIST_FILE = "Toilet Lisp-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1224,9 +1235,8 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = "Toilet Lisp"; - USER_HEADER_SEARCH_PATHS = /opt/local/include; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; WRAPPER_EXTENSION = app; ZERO_LINK = YES; }; @@ -1236,7 +1246,6 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; @@ -1245,7 +1254,10 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; INFOPLIST_FILE = "Toilet Lisp-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1282,9 +1294,8 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = "Toilet Lisp"; - USER_HEADER_SEARCH_PATHS = /opt/local/include; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; }; @@ -1293,7 +1304,6 @@ A72BC6F60E65DE4900486804 /* Release 10.4+ (fast) */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1301,7 +1311,10 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; INFOPLIST_FILE = "Toilet Lisp-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1338,9 +1351,8 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = "Toilet Lisp"; - USER_HEADER_SEARCH_PATHS = /opt/local/include; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; WRAPPER_EXTENSION = app; ZERO_LINK = YES; }; @@ -1349,7 +1361,6 @@ A72BC6F70E65DE4900486804 /* Release 10.4+ (fast + GC) */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; @@ -1358,7 +1369,10 @@ GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; INFOPLIST_FILE = "Toilet Lisp-Info.plist"; INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1395,9 +1409,8 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = "Toilet Lisp"; - USER_HEADER_SEARCH_PATHS = /opt/local/include; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; WRAPPER_EXTENSION = app; ZERO_LINK = YES; }; @@ -1408,15 +1421,17 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - HEADER_SEARCH_PATHS = /opt/local/include; INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1435,9 +1450,8 @@ "-framework", Foundation, ); - PREBINDING = NO; PRODUCT_NAME = "toilet-llvm"; - USER_HEADER_SEARCH_PATHS = /opt/local/lib; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; ZERO_LINK = YES; }; name = Debug; @@ -1445,13 +1459,15 @@ A745C3540E607C8700C43A04 /* Debug 10.4+ (fast) */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - HEADER_SEARCH_PATHS = /opt/local/include; INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1470,9 +1486,8 @@ "-framework", Foundation, ); - PREBINDING = NO; PRODUCT_NAME = "toilet-llvm"; - USER_HEADER_SEARCH_PATHS = /opt/local/lib; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; ZERO_LINK = YES; }; name = "Debug 10.4+ (fast)"; @@ -1480,14 +1495,16 @@ A745C3550E607C8700C43A04 /* Debug 10.4+ (fast + GC) */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = supported; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - HEADER_SEARCH_PATHS = /opt/local/include; INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1506,9 +1523,8 @@ "-framework", Foundation, ); - PREBINDING = NO; PRODUCT_NAME = "toilet-llvm"; - USER_HEADER_SEARCH_PATHS = /opt/local/lib; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; ZERO_LINK = YES; }; name = "Debug 10.4+ (fast + GC)"; @@ -1517,14 +1533,16 @@ isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - HEADER_SEARCH_PATHS = /opt/local/include; INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1543,9 +1561,8 @@ "-framework", Foundation, ); - PREBINDING = NO; PRODUCT_NAME = "toilet-llvm"; - USER_HEADER_SEARCH_PATHS = /opt/local/lib; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; ZERO_LINK = NO; }; name = Release; @@ -1553,13 +1570,15 @@ A745C3570E607C8700C43A04 /* Release 10.4+ (fast) */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - HEADER_SEARCH_PATHS = /opt/local/include; INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1578,9 +1597,8 @@ "-framework", Foundation, ); - PREBINDING = NO; PRODUCT_NAME = "toilet-llvm"; - USER_HEADER_SEARCH_PATHS = /opt/local/lib; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; ZERO_LINK = YES; }; name = "Release 10.4+ (fast)"; @@ -1588,14 +1606,16 @@ A745C3580E607C8700C43A04 /* Release 10.4+ (fast + GC) */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = supported; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - HEADER_SEARCH_PATHS = /opt/local/include; INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = ( "$(inherited)", @@ -1614,9 +1634,8 @@ "-framework", Foundation, ); - PREBINDING = NO; PRODUCT_NAME = "toilet-llvm"; - USER_HEADER_SEARCH_PATHS = /opt/local/lib; + USER_HEADER_SEARCH_PATHS = "/opt/homebrew/include /opt/local/include"; ZERO_LINK = YES; }; name = "Release 10.4+ (fast + GC)"; @@ -1626,7 +1645,6 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = G4; @@ -1634,9 +1652,15 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1649,7 +1673,6 @@ "-L/opt/local/lib", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -1660,7 +1683,6 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_FAST_OBJC_DISPATCH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1669,9 +1691,15 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1684,7 +1712,6 @@ "-L/opt/local/lib", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -1695,7 +1722,6 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = required; GCC_FAST_OBJC_DISPATCH = YES; @@ -1705,9 +1731,15 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Foundation.framework/Headers/Foundation.h"; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1720,7 +1752,6 @@ "-L/opt/local/lib", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -1736,16 +1767,21 @@ x86_64, ); COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G4; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1758,7 +1794,6 @@ "-L/opt/local/lib", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -1774,7 +1809,6 @@ x86_64, ); COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_FAST_OBJC_DISPATCH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -1782,9 +1816,15 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1797,7 +1837,6 @@ "-L/opt/local/lib", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -1813,7 +1852,6 @@ x86_64, ); COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = required; GCC_FAST_OBJC_DISPATCH = YES; @@ -1822,9 +1860,15 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( @@ -1837,7 +1881,6 @@ "-L/opt/local/lib", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -1851,7 +1894,6 @@ DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_FAST_OBJC_DISPATCH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1860,10 +1902,16 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INFOPLIST_FILE = "ToiletKit-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Frameworks"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = "$(inherited)"; @@ -1873,8 +1921,8 @@ "-lgmp", "-lffi", "-L/opt/local/lib", + "-L/opt/homebrew/lib", ); - PREBINDING = NO; PRODUCT_NAME = ToiletKit; ZERO_LINK = YES; }; @@ -1885,7 +1933,6 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_FAST_OBJC_DISPATCH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1895,9 +1942,15 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; "GCC_VERSION[arch=*]" = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); OTHER_CFLAGS = ( "$(inherited)", "-DUSE_LLVM", @@ -1993,7 +2046,6 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -2026,7 +2078,6 @@ DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = supported; GCC_FAST_OBJC_DISPATCH = YES; @@ -2036,10 +2087,16 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INFOPLIST_FILE = "ToiletKit-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Frameworks"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = "$(inherited)"; @@ -2049,8 +2106,8 @@ "-lgmp", "-lffi", "-L/opt/local/lib", + "-L/opt/homebrew/lib", ); - PREBINDING = NO; PRODUCT_NAME = ToiletKit; ZERO_LINK = YES; }; @@ -2061,7 +2118,6 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = required; GCC_FAST_OBJC_DISPATCH = YES; @@ -2072,9 +2128,15 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Foundation.framework/Headers/Foundation.h"; "GCC_VERSION[arch=*]" = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); OTHER_CFLAGS = ( "$(inherited)", "-DUSE_LLVM", @@ -2170,7 +2232,6 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -2208,7 +2269,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_FAST_OBJC_DISPATCH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -2216,10 +2276,16 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INFOPLIST_FILE = "ToiletKit-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Frameworks"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = "$(inherited)"; @@ -2229,8 +2295,8 @@ "-lgmp", "-lffi", "-L/opt/local/lib", + "-L/opt/homebrew/lib", ); - PREBINDING = NO; PRODUCT_NAME = ToiletKit; ZERO_LINK = NO; }; @@ -2249,7 +2315,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = supported; GCC_FAST_OBJC_DISPATCH = YES; @@ -2258,10 +2323,16 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INFOPLIST_FILE = "ToiletKit-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Frameworks"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = "$(inherited)"; @@ -2271,8 +2342,8 @@ "-lgmp", "-lffi", "-L/opt/local/lib", + "-L/opt/homebrew/lib", ); - PREBINDING = NO; PRODUCT_NAME = ToiletKit; ZERO_LINK = NO; }; @@ -2288,7 +2359,6 @@ x86_64, ); COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_FAST_OBJC_DISPATCH = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -2297,9 +2367,15 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; "GCC_VERSION[arch=*]" = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); OTHER_CFLAGS = ( "$(inherited)", "-DUSE_LLVM", @@ -2395,7 +2471,6 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -2411,7 +2486,6 @@ x86_64, ); COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_GC = required; GCC_FAST_OBJC_DISPATCH = YES; @@ -2421,9 +2495,15 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; "GCC_VERSION[arch=*]" = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); OTHER_CFLAGS = ( "$(inherited)", "-DUSE_LLVM", @@ -2519,7 +2599,6 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -2609,7 +2688,6 @@ DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = G4; @@ -2617,10 +2695,16 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INFOPLIST_FILE = "ToiletKit-Info.plist"; INSTALL_PATH = /Library/Frameworks; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = "$(inherited)"; @@ -2630,8 +2714,8 @@ "-lgmp", "-lffi", "-L/opt/local/lib", + "-L/opt/homebrew/lib", ); - PREBINDING = NO; PRODUCT_NAME = ToiletKit; ZERO_LINK = YES; }; @@ -2650,17 +2734,22 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G4; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INFOPLIST_FILE = "ToiletKit-Info.plist"; INSTALL_PATH = "$(HOME)/Library/Frameworks"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); MACOSX_DEPLOYMENT_TARGET = ""; OTHER_CFLAGS = "$(inherited)"; OTHER_CPLUSPLUSFLAGS = "$(inherited)"; @@ -2670,8 +2759,8 @@ "-lgmp", "-lffi", "-L/opt/local/lib", + "-L/opt/homebrew/lib", ); - PREBINDING = NO; PRODUCT_NAME = ToiletKit; ZERO_LINK = NO; }; @@ -2682,7 +2771,6 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = G4; @@ -2691,9 +2779,15 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; "GCC_VERSION[arch=*]" = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); OTHER_CFLAGS = ( "$(inherited)", "-DUSE_LLVM", @@ -2789,7 +2883,6 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; @@ -2805,7 +2898,6 @@ x86_64, ); COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G4; @@ -2813,9 +2905,15 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; "GCC_VERSION[arch=*]" = ""; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - HEADER_SEARCH_PATHS = /opt/local/include; + HEADER_SEARCH_PATHS = ( + /opt/homebrew/include, + /opt/local/include, + ); INSTALL_PATH = "$(HOME)/bin"; - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ( + /opt/homebrew/lib, + /opt/local/lib, + ); OTHER_CFLAGS = ( "$(inherited)", "-DUSE_LLVM", @@ -2911,7 +3009,6 @@ "-lLLVMSystem", "-lstdc++", ); - PREBINDING = NO; PRODUCT_NAME = toilet; ZERO_LINK = NO; }; diff --git a/configure b/configure index 34e8c30..d49918b 100755 --- a/configure +++ b/configure @@ -22,11 +22,11 @@ $darwin = (`uname -s` =~ "Darwin"); $debian = !$darwin && (`apt-cache show llvm 2>/dev/null` =~ /.*llvm.*/); $CC = defined($ENV{'CC'}) ? $ENV{'CC'} : "gcc"; -$CFLAGS = defined($ENV{'CFLAGS'}) ? $ENV{'CFLAGS'} : ($darwin ? "-I/opt/local/include" : ""); +$CFLAGS = defined($ENV{'CFLAGS'}) ? $ENV{'CFLAGS'} : ($darwin ? "-I/opt/local/include -I/opt/homebrew/include" : ""); $OBJCFLAGS = defined($ENV{'OBJCFLAGS'}) ? $ENV{'OBJCFLAGS'} : $CFLAGS; $CXXFLAGS = defined($ENV{'CXXFLAGS'}) ? $ENV{'CXXFLAGS'} : $CFLAGS; $OBJCCFLAGS = defined($ENV{'OBJCCFLAGS'}) ? $ENV{'OBJCCFLAGS'} : "$CXXFLAGS $OBJCFLAGS"; -$LDFLAGS = defined($ENV{'LDFLAGS'}) ? $ENV{'LDFLAGS'} : ($darwin ? "-L/opt/local/lib" : ""); +$LDFLAGS = defined($ENV{'LDFLAGS'}) ? $ENV{'LDFLAGS'} : ($darwin ? "-L/opt/local/lib -L/opt/homebrew/include" : ""); $MAKE = defined($ENV{'MAKE'}) ? $ENV{'MAKE'} : "make"; $XCODEBUILD = defined($ENV{'XCODEBUILD'}) ? $ENV{'XCODEBUILD'} : "xcodebuild"; $LLVM_CONFIG = defined($ENV{'LLVM_CONFIG'}) ? $ENV{'LLVM_CONFIG'} : "llvm-config"; -- cgit v1.2.3