From e184f97d824a709d3bc2a0a38b4650fd4cb01e43 Mon Sep 17 00:00:00 2001 From: 1R053 <1121003+1R053@users.noreply.github.com> Date: Tue, 12 Nov 2024 23:43:40 +0100 Subject: [PATCH 1/5] Mac Sequoia build compatibility Updated Mac build for Sequoia compatibility, removed 386 support on Mac --- ChangeLog | 4 ++++ mac/iODBC/iODBC.xcodeproj/project.pbxproj | 16 ++++------------ mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj | 16 ++++------------ .../iODBCadministrator.xcodeproj/project.pbxproj | 14 ++++---------- .../project.pbxproj | 4 ++-- .../DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj | 4 ++++ .../DemoUnicode.xcodeproj/project.pbxproj | 14 ++++---------- .../iODBCdrvproxy.xcodeproj/project.pbxproj | 16 ++++------------ .../iODBCinst.xcodeproj/project.pbxproj | 6 ++++-- .../iODBCtest.xcodeproj/project.pbxproj | 4 ++++ .../iODBCtestw.xcodeproj/project.pbxproj | 4 ++++ 11 files changed, 42 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index deec4ac8..b8817b62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2024-11-12 Jörg Rose + + Updated Mac build for Sequoia compatibility, removed 386 support on Mac + 2023-05-02 Patrick van Kleef Updated NEWS diff --git a/mac/iODBC/iODBC.xcodeproj/project.pbxproj b/mac/iODBC/iODBC.xcodeproj/project.pbxproj index c06e49a6..27238a0e 100644 --- a/mac/iODBC/iODBC.xcodeproj/project.pbxproj +++ b/mac/iODBC/iODBC.xcodeproj/project.pbxproj @@ -681,11 +681,7 @@ CDAE3AAE0987CB86003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - $IODBC_32BIT, - arm64, - x86_64, - ); + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -714,7 +710,7 @@ INFOPLIST_FILE = "Info-iODBC.plist"; INSTALL_PATH = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.core; PRODUCT_NAME = iODBC; @@ -733,11 +729,7 @@ CDAE3AAF0987CB86003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - $IODBC_32BIT, - arm64, - x86_64, - ); + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -765,7 +757,7 @@ INFOPLIST_FILE = "Info-iODBC.plist"; INSTALL_PATH = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.core; PRODUCT_NAME = iODBC; diff --git a/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj b/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj index 1512bb92..c4f5bf6f 100644 --- a/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj +++ b/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj @@ -559,11 +559,7 @@ CDAE3C200987D71D003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - arm64, - $IODBC_32BIT, - x86_64, - ); + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -593,7 +589,7 @@ INSTALL_PATH = /; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = BUNDLE; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", @@ -618,11 +614,7 @@ CDAE3C210987D71D003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - arm64, - $IODBC_32BIT, - x86_64, - ); + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -645,7 +637,7 @@ INSTALL_PATH = /; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", diff --git a/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj b/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj index 82507500..1c36126e 100644 --- a/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj +++ b/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj @@ -274,10 +274,7 @@ CDAE3B870987D655003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - arm64, - $IODBC_32BIT, - ); + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = YES; @@ -304,7 +301,7 @@ INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; INSTALL_PATH = /Applications/iODBC; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -331,10 +328,7 @@ CDAE3B880987D655003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - arm64, - $IODBC_32BIT, - ); + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -354,7 +348,7 @@ INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; INSTALL_PATH = /Applications/iODBC; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( diff --git a/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj b/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj index 69296bdf..5015fb74 100644 --- a/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj +++ b/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj @@ -301,7 +301,7 @@ INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; INSTALL_PATH = /Applications/iODBC; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -348,7 +348,7 @@ INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; INSTALL_PATH = /Applications/iODBC; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( diff --git a/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj b/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj index e46b4748..0c2e9434 100644 --- a/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj +++ b/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj @@ -360,6 +360,7 @@ CD7C37B50A063F40001A43B7 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; @@ -375,6 +376,7 @@ HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoAnsi.plist; INSTALL_PATH = /Applications/iODBC; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-ansi"; PRODUCT_NAME = "iODBC Demo Ansi"; WRAPPER_EXTENSION = app; @@ -385,6 +387,7 @@ CD7C37B60A063F40001A43B7 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; FRAMEWORK_SEARCH_PATHS = ( ../../../mac/iODBC/build/Deployment, @@ -397,6 +400,7 @@ HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoAnsi.plist; INSTALL_PATH = /Applications/iODBC; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-ansi"; PRODUCT_NAME = "iODBC Demo Ansi"; WRAPPER_EXTENSION = app; diff --git a/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj b/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj index 1dd1fa1a..e2b38c35 100644 --- a/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj +++ b/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj @@ -281,11 +281,7 @@ C01FCF4B08A954540054247B /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - arm64, - $IODBC_32BIT, - x86_64, - ); + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; @@ -301,6 +297,7 @@ HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoUnicode.plist; INSTALL_PATH = /Applications/iODBC; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-DUNICODE"; PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-unicode"; PRODUCT_NAME = "iODBC Demo Unicode"; @@ -312,11 +309,7 @@ C01FCF4C08A954540054247B /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - arm64, - $IODBC_32BIT, - x86_64, - ); + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; FRAMEWORK_SEARCH_PATHS = ( ../../../mac/iODBC/build/Deployment, @@ -329,6 +322,7 @@ HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoUnicode.plist; INSTALL_PATH = /Applications/iODBC; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-DUNICODE"; PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-unicode"; PRODUCT_NAME = "iODBC Demo Unicode"; diff --git a/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj b/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj index 543b9618..93572be5 100644 --- a/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj +++ b/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj @@ -368,11 +368,7 @@ CDAE3BC80987D6B4003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - arm64, - $IODBC_32BIT, - x86_64, - ); + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -402,7 +398,7 @@ INSTALL_PATH = /; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", @@ -428,11 +424,7 @@ CDAE3BC90987D6B4003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - arm64, - $IODBC_32BIT, - x86_64, - ); + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -453,7 +445,7 @@ INFOPLIST_FILE = "Info-iODBCdrvproxy.plist"; INSTALL_PATH = /; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", diff --git a/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj b/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj index 4e16d689..591876f2 100644 --- a/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj +++ b/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj @@ -491,6 +491,7 @@ CDAE3B0D0987CDA2003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -518,7 +519,7 @@ INFOPLIST_FILE = "Info-iODBCinst.plist"; INSTALL_PATH = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.inst; PRODUCT_NAME = iODBCinst; @@ -537,6 +538,7 @@ CDAE3B0E0987CDA2003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -563,7 +565,7 @@ INFOPLIST_FILE = "Info-iODBCinst.plist"; INSTALL_PATH = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.inst; PRODUCT_NAME = iODBCinst; diff --git a/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj b/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj index fd26f297..0cbbc137 100644 --- a/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj +++ b/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj @@ -155,6 +155,7 @@ CDAE3B350987CEF4003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; @@ -174,6 +175,7 @@ HEADER_SEARCH_PATHS = ../../include; INSTALL_PATH = "/Library/Application Support/iODBC/bin"; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = iodbctest; @@ -192,6 +194,7 @@ CDAE3B360987CEF4003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -209,6 +212,7 @@ HEADER_SEARCH_PATHS = ../../include; INSTALL_PATH = "/Library/Application Support/iODBC/bin"; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = iodbctest; diff --git a/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj b/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj index 329a9d78..2aec174f 100644 --- a/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj +++ b/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj @@ -155,6 +155,7 @@ CDAE3B570987CF60003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; @@ -174,6 +175,7 @@ HEADER_SEARCH_PATHS = ../../include; INSTALL_PATH = "/Library/Application Support/iODBC/bin"; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = iodbctestw; @@ -192,6 +194,7 @@ CDAE3B580987CF60003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -208,6 +211,7 @@ HEADER_SEARCH_PATHS = ../../include; INSTALL_PATH = "/Library/Application Support/iODBC/bin"; LIBRARY_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = iodbctestw; From 6d35ff629771d6ad8fcfe42c8296bf3ec6c5dbe0 Mon Sep 17 00:00:00 2001 From: 1R053 <1121003+1R053@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:00:51 +0100 Subject: [PATCH 2/5] Revert "Mac Sequoia build compatibility" This reverts commit e184f97d824a709d3bc2a0a38b4650fd4cb01e43. --- ChangeLog | 4 ---- mac/iODBC/iODBC.xcodeproj/project.pbxproj | 16 ++++++++++++---- mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj | 16 ++++++++++++---- .../iODBCadministrator.xcodeproj/project.pbxproj | 14 ++++++++++---- .../project.pbxproj | 4 ++-- .../DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj | 4 ---- .../DemoUnicode.xcodeproj/project.pbxproj | 14 ++++++++++---- .../iODBCdrvproxy.xcodeproj/project.pbxproj | 16 ++++++++++++---- .../iODBCinst.xcodeproj/project.pbxproj | 6 ++---- .../iODBCtest.xcodeproj/project.pbxproj | 4 ---- .../iODBCtestw.xcodeproj/project.pbxproj | 4 ---- 11 files changed, 60 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8817b62..deec4ac8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,3 @@ -2024-11-12 Jörg Rose - - Updated Mac build for Sequoia compatibility, removed 386 support on Mac - 2023-05-02 Patrick van Kleef Updated NEWS diff --git a/mac/iODBC/iODBC.xcodeproj/project.pbxproj b/mac/iODBC/iODBC.xcodeproj/project.pbxproj index 27238a0e..c06e49a6 100644 --- a/mac/iODBC/iODBC.xcodeproj/project.pbxproj +++ b/mac/iODBC/iODBC.xcodeproj/project.pbxproj @@ -681,7 +681,11 @@ CDAE3AAE0987CB86003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + $IODBC_32BIT, + arm64, + x86_64, + ); CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -710,7 +714,7 @@ INFOPLIST_FILE = "Info-iODBC.plist"; INSTALL_PATH = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.core; PRODUCT_NAME = iODBC; @@ -729,7 +733,11 @@ CDAE3AAF0987CB86003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + $IODBC_32BIT, + arm64, + x86_64, + ); CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -757,7 +765,7 @@ INFOPLIST_FILE = "Info-iODBC.plist"; INSTALL_PATH = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.core; PRODUCT_NAME = iODBC; diff --git a/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj b/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj index c4f5bf6f..1512bb92 100644 --- a/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj +++ b/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj @@ -559,7 +559,11 @@ CDAE3C200987D71D003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + arm64, + $IODBC_32BIT, + x86_64, + ); CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -589,7 +593,7 @@ INSTALL_PATH = /; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = BUNDLE; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", @@ -614,7 +618,11 @@ CDAE3C210987D71D003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + arm64, + $IODBC_32BIT, + x86_64, + ); CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -637,7 +645,7 @@ INSTALL_PATH = /; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", diff --git a/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj b/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj index 1c36126e..82507500 100644 --- a/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj +++ b/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj @@ -274,7 +274,10 @@ CDAE3B870987D655003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + arm64, + $IODBC_32BIT, + ); CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = YES; @@ -301,7 +304,7 @@ INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; INSTALL_PATH = /Applications/iODBC; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -328,7 +331,10 @@ CDAE3B880987D655003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + arm64, + $IODBC_32BIT, + ); CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -348,7 +354,7 @@ INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; INSTALL_PATH = /Applications/iODBC; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( diff --git a/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj b/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj index 5015fb74..69296bdf 100644 --- a/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj +++ b/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj @@ -301,7 +301,7 @@ INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; INSTALL_PATH = /Applications/iODBC; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -348,7 +348,7 @@ INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; INSTALL_PATH = /Applications/iODBC; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( diff --git a/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj b/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj index 0c2e9434..e46b4748 100644 --- a/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj +++ b/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj @@ -360,7 +360,6 @@ CD7C37B50A063F40001A43B7 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; @@ -376,7 +375,6 @@ HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoAnsi.plist; INSTALL_PATH = /Applications/iODBC; - MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-ansi"; PRODUCT_NAME = "iODBC Demo Ansi"; WRAPPER_EXTENSION = app; @@ -387,7 +385,6 @@ CD7C37B60A063F40001A43B7 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; FRAMEWORK_SEARCH_PATHS = ( ../../../mac/iODBC/build/Deployment, @@ -400,7 +397,6 @@ HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoAnsi.plist; INSTALL_PATH = /Applications/iODBC; - MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-ansi"; PRODUCT_NAME = "iODBC Demo Ansi"; WRAPPER_EXTENSION = app; diff --git a/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj b/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj index e2b38c35..1dd1fa1a 100644 --- a/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj +++ b/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj @@ -281,7 +281,11 @@ C01FCF4B08A954540054247B /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + arm64, + $IODBC_32BIT, + x86_64, + ); CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; @@ -297,7 +301,6 @@ HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoUnicode.plist; INSTALL_PATH = /Applications/iODBC; - MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-DUNICODE"; PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-unicode"; PRODUCT_NAME = "iODBC Demo Unicode"; @@ -309,7 +312,11 @@ C01FCF4C08A954540054247B /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + arm64, + $IODBC_32BIT, + x86_64, + ); CLANG_ENABLE_OBJC_WEAK = YES; FRAMEWORK_SEARCH_PATHS = ( ../../../mac/iODBC/build/Deployment, @@ -322,7 +329,6 @@ HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoUnicode.plist; INSTALL_PATH = /Applications/iODBC; - MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-DUNICODE"; PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-unicode"; PRODUCT_NAME = "iODBC Demo Unicode"; diff --git a/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj b/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj index 93572be5..543b9618 100644 --- a/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj +++ b/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj @@ -368,7 +368,11 @@ CDAE3BC80987D6B4003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + arm64, + $IODBC_32BIT, + x86_64, + ); CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -398,7 +402,7 @@ INSTALL_PATH = /; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", @@ -424,7 +428,11 @@ CDAE3BC90987D6B4003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + arm64, + $IODBC_32BIT, + x86_64, + ); CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -445,7 +453,7 @@ INFOPLIST_FILE = "Info-iODBCdrvproxy.plist"; INSTALL_PATH = /; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", diff --git a/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj b/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj index 591876f2..4e16d689 100644 --- a/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj +++ b/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj @@ -491,7 +491,6 @@ CDAE3B0D0987CDA2003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -519,7 +518,7 @@ INFOPLIST_FILE = "Info-iODBCinst.plist"; INSTALL_PATH = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.inst; PRODUCT_NAME = iODBCinst; @@ -538,7 +537,6 @@ CDAE3B0E0987CDA2003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -565,7 +563,7 @@ INFOPLIST_FILE = "Info-iODBCinst.plist"; INSTALL_PATH = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.inst; PRODUCT_NAME = iODBCinst; diff --git a/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj b/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj index 0cbbc137..fd26f297 100644 --- a/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj +++ b/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj @@ -155,7 +155,6 @@ CDAE3B350987CEF4003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; @@ -175,7 +174,6 @@ HEADER_SEARCH_PATHS = ../../include; INSTALL_PATH = "/Library/Application Support/iODBC/bin"; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = iodbctest; @@ -194,7 +192,6 @@ CDAE3B360987CEF4003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -212,7 +209,6 @@ HEADER_SEARCH_PATHS = ../../include; INSTALL_PATH = "/Library/Application Support/iODBC/bin"; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = iodbctest; diff --git a/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj b/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj index 2aec174f..329a9d78 100644 --- a/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj +++ b/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj @@ -155,7 +155,6 @@ CDAE3B570987CF60003250F8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; @@ -175,7 +174,6 @@ HEADER_SEARCH_PATHS = ../../include; INSTALL_PATH = "/Library/Application Support/iODBC/bin"; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = iodbctestw; @@ -194,7 +192,6 @@ CDAE3B580987CF60003250F8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_WEAK = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; @@ -211,7 +208,6 @@ HEADER_SEARCH_PATHS = ../../include; INSTALL_PATH = "/Library/Application Support/iODBC/bin"; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; PRODUCT_NAME = iodbctestw; From 243ccb5f8479e6d0306b2d9ec899dfec7ad82f38 Mon Sep 17 00:00:00 2001 From: 1R053 <1121003+1R053@users.noreply.github.com> Date: Mon, 3 Feb 2025 23:34:17 +0100 Subject: [PATCH 3/5] development universal build fixes --- README_MACOSX.md | 86 +++++++++++-------- mac/GNUmakefile | 83 ++++++++++-------- mac/iODBC/iODBC.xcodeproj/project.pbxproj | 8 +- .../iODBCadm.xcodeproj/project.pbxproj | 16 ++-- .../project.pbxproj | 31 +++---- .../project.pbxproj | 23 ++--- .../DemoAnsi.xcodeproj/project.pbxproj | 21 ++--- .../DemoUnicode.xcodeproj/project.pbxproj | 21 ++--- .../iODBCdrvproxy.xcodeproj/project.pbxproj | 10 +-- .../iODBCinst.xcodeproj/project.pbxproj | 22 ++--- .../iODBCtest.xcodeproj/project.pbxproj | 12 +-- .../iODBCtestw.xcodeproj/project.pbxproj | 12 +-- 12 files changed, 190 insertions(+), 155 deletions(-) mode change 100644 => 100755 README_MACOSX.md mode change 100644 => 100755 mac/GNUmakefile mode change 100644 => 100755 mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj mode change 100644 => 100755 mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj mode change 100644 => 100755 mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj mode change 100644 => 100755 mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj mode change 100644 => 100755 mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj mode change 100644 => 100755 mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj mode change 100644 => 100755 mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj mode change 100644 => 100755 mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj mode change 100644 => 100755 mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj diff --git a/README_MACOSX.md b/README_MACOSX.md old mode 100644 new mode 100755 index 6d3a4745..ef93a7e7 --- a/README_MACOSX.md +++ b/README_MACOSX.md @@ -18,14 +18,28 @@ Packages, which you can download from . Then, execute the following commands in a terminal session, to build all the frameworks and demo applications: ```shell -$ cd mac -$ make +cd mac +make +``` + +In case there are errors first try to clean up temporary files: + +```shell +sudo make clean ``` After building the iODBC libraries and applications, you have to install them on your system with the command: ```shell -$ sudo make install +sudo make install +``` + +For generating and installing a development build with debug symbols run: + +```shell +sudo make realclean +make MODEL=Development +sudo make install MODEL=Development ``` This installs the `iODBCinst` and `iODBC` frameworks into — @@ -86,16 +100,16 @@ using the [HomeBrew package manager](http://brew.sh/) to install these tools, ac To build the libraries, open up a terminal session in **`Terminal.app`** or similar, and execute the following commands: ```shell -$ sh autogen.sh -$ ./configure -$ make +sh autogen.sh +./configure +make ``` To install the header files and libraries in `/usr/local`, execute the following command as an administrator, and provide that user's password when prompted: ```shell -$ sudo make install +sudo make install ``` Note that, by default, this will build components that only run on the CPU type you are building on, so `ppc` @@ -112,18 +126,18 @@ The following commands will build a release of iODBC that supports Mac OS X Leop Mac OS X Snow Leopard (10.6), on `ppc` (including as emulated by Rosetta), `x86`, and `x86_64`: ```shell -$ CFLAGS="-O -arch ppc -arch i386 -arch x86_64" -$ CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk" -$ CFLAGS="$CFLAGS -mmacosx-version-min=10.5" -$ export CFLAGS +CFLAGS="-O -arch ppc -arch i386 -arch x86_64" +CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.5.sdk" +CFLAGS="$CFLAGS -mmacosx-version-min=10.5" +export CFLAGS -$ sh autogen.sh -$ ./configure \ +sh autogen.sh +./configure \ --disable-dependency-tracking \ --prefix=/usr/local/iODBC.universal -$ make -$ sudo make install +make +sudo make install ``` ### Mac OS X Lion (10.7) and OS X Mountain Lion (10.8) @@ -132,17 +146,17 @@ The following commands will build a release of iODBC that works on Mac OS X Lion and OS X Mountain Lion (10.8): ```shell -$ CFLAGS="-O -arch i386 -arch x86_64" -$ CFLAGS="$CFLAGS -mmacosx-version-min=10.7" -$ export CFLAGS +CFLAGS="-O -arch i386 -arch x86_64" +CFLAGS="$CFLAGS -mmacosx-version-min=10.7" +export CFLAGS -$ sh autogen.sh -$ ./configure \ +sh autogen.sh +./configure \ --disable-dependency-tracking \ --prefix=/usr/local/iODBC.universal -$ make -$ sudo make install +make +sudo make install ``` ### OS X Mavericks (10.9) through macOS Big Sur (11.x) on `x86` or `x86_64` (including Rosetta2 emulation) @@ -152,17 +166,17 @@ supporting other components built for `x86` (through macOS Mojave (10.14), where components) or `x86_64` (including Rosetta2 emulation): ```shell -$ CFLAGS="-O -arch i386 -arch x86_64" -$ CFLAGS="$CFLAGS -mmacosx-version-min=10.9" -$ export CFLAGS +CFLAGS="-O -arch i386 -arch x86_64" +CFLAGS="$CFLAGS -mmacosx-version-min=10.9" +export CFLAGS -$ sh autogen.sh -$ ./configure \ +sh autogen.sh +./configure \ --disable-dependency-tracking \ --prefix=/usr/local/iODBC.universal -$ make -$ sudo make install +$make +sudo make install ``` ### macOS Big Sur (11.x) through macOS Ventura (13.x) on `x86_64` (including Rosetta2 emulation) or `arm64` (Apple Silicon a/k/a M1 or M2) @@ -171,17 +185,17 @@ The following commands will build a release of iODBC that works on macOS Big Sur running on Intel (`x86_64`) or Apple Silicon (`arm64` a/k/a `M1` or `M2`): ```shell -$ CFLAGS="-O -arch arm64 -arch x86_64" -$ CFLAGS="$CFLAGS -mmacosx-version-min=10.9" -$ export CFLAGS +CFLAGS="-O -arch arm64 -arch x86_64" +CFLAGS="$CFLAGS -mmacosx-version-min=10.9" +export CFLAGS -$ sh autogen.sh -$ ./configure \ +sh autogen.sh +./configure \ --disable-dependency-tracking \ --prefix=/usr/local/iODBC.universal -$ make -$ sudo make install +make +sudo make install ``` ### Test DSN connection diff --git a/mac/GNUmakefile b/mac/GNUmakefile old mode 100644 new mode 100755 index 19f09d87..efbf37cd --- a/mac/GNUmakefile +++ b/mac/GNUmakefile @@ -73,7 +73,7 @@ # # iODBC VERSION # -IODBC_VERSION=3.52.16 +IODBC_VERSION=3.52.17 # @@ -101,6 +101,9 @@ xcodebuild_version := $(shell xcodebuild -version | grep -i Xcode | cut -d " " - # Common build settings # PROJBUILD := /usr/bin/xcodebuild -configuration $(MODEL) +DEPLOYMENT_TARGET := "10.13" +IODBC_UNI := "arm64 x86_64" +IODBC_X64 := "x86_64" IODBC_32BIT = "i386" @@ -113,12 +116,19 @@ endif # -# macOS 11.x (BigSur)does not have 32bit support +# macOS 11.x (BigSur) and later do not have 32bit support # -ifeq (11, $(findstring 11, $(macos_major))) +ifeq ($(shell test $(macos_version) -ge 11; echo $$?),0) IODBC_32BIT := "x86_64" endif +# +# Additional build flags for modern macOS +# +XCODE_FLAGS_UNI := MACOSX_DEPLOYMENT_TARGET=$(DEPLOYMENT_TARGET) ARCHS=$(IODBC_UNI) +XCODE_FLAGS_X64 := MACOSX_DEPLOYMENT_TARGET=$(DEPLOYMENT_TARGET) ARCHS=$(IODBC_X64) +PROJBUILD_UNI := $(PROJBUILD) $(XCODE_FLAGS_UNI) +PROJBUILD_X64 := $(PROJBUILD) $(XCODE_FLAGS_X64) # # Pass settings to xcodebuild @@ -131,17 +141,18 @@ export IODBC_VERSION IODBC_32BIT # all: check_supported include @echo "Building on macOS $(macos_version)" - @echo "Projbuild is [$(PROJBUILD)]" - cd iODBCinst; $(PROJBUILD) build - cd iODBC; $(PROJBUILD) build - cd iODBCtest; $(PROJBUILD) build - cd iODBCtestw; $(PROJBUILD) build - cd iODBCdrvproxy; $(PROJBUILD) build - cd iODBCadm; $(PROJBUILD) build - cd iODBCadministrator; $(PROJBUILD) build - cd iODBCadministrator64; $(PROJBUILD) build - cd iODBCdemo/DemoAnsi; $(PROJBUILD) build - cd iODBCdemo/DemoUnicode; $(PROJBUILD) build + @echo "Deployment Target is $(DEPLOYMENT_TARGET)" + @echo "Projbuild is [$(PROJBUILD_UNI)]" + cd iODBCinst; $(PROJBUILD_UNI) build + cd iODBC; $(PROJBUILD_UNI) build + cd iODBCtest; $(PROJBUILD_UNI) build + cd iODBCtestw; $(PROJBUILD_UNI) build + cd iODBCdrvproxy; $(PROJBUILD_UNI) build + cd iODBCadm; $(PROJBUILD_UNI) build + cd iODBCadministrator; $(PROJBUILD_UNI) build + cd iODBCadministrator64; $(PROJBUILD_X64) build + cd iODBCdemo/DemoAnsi; $(PROJBUILD_UNI) build + cd iODBCdemo/DemoUnicode; $(PROJBUILD_UNI) build # @@ -172,8 +183,8 @@ install: # -rm $(DESTDIR)/Library/Frameworks/iODBC.framework/Versions/Current -rm $(DESTDIR)/Library/Frameworks/iODBCinst.framework/Versions/Current - cd iODBCinst; $(PROJBUILD) install DSTROOT=$(DESTDIR)/ - cd iODBC; $(PROJBUILD) install DSTROOT=$(DESTDIR)/ + cd iODBCinst; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Library/Frameworks/ + cd iODBC; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Library/Frameworks/ # # Install /usr/local/iODBC # @@ -181,20 +192,20 @@ install: # # Install iODBC Administrator # - cd iODBCadministrator; $(PROJBUILD) install DSTROOT=$(DESTDIR)/ - cd iODBCadministrator64; $(PROJBUILD) install DSTROOT=$(DESTDIR)/ + cd iODBCadministrator; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Applications/iODBC; + cd iODBCadministrator64; $(PROJBUILD_X64) install DSTROOT=$(DESTDIR)/Applications/iODBC; # Next ones are a bit special as they need to be installed twice - cd iODBCadm; $(PROJBUILD) install DSTROOT=$(DESTDIR)/Library/Frameworks/iODBC.framework/Resources/ - cd iODBCadm; $(PROJBUILD) install DSTROOT=$(DESTDIR)/Library/Frameworks/iODBCinst.framework/Resources/ - cd iODBCdrvproxy; $(PROJBUILD) install DSTROOT=$(DESTDIR)/Library/Frameworks/iODBC.framework/Resources/ - cd iODBCdrvproxy; $(PROJBUILD) install DSTROOT=$(DESTDIR)/Library/Frameworks/iODBCinst.framework/Resources/ + cd iODBCadm; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Library/Frameworks/iODBC.framework/Resources/ + cd iODBCadm; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Library/Frameworks/iODBCinst.framework/Resources/ + cd iODBCdrvproxy; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Library/Frameworks/iODBC.framework/Resources/ + cd iODBCdrvproxy; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Library/Frameworks/iODBCinst.framework/Resources/ # # Install application # - cd iODBCdemo/DemoAnsi; $(PROJBUILD) install DSTROOT=$(DESTDIR)/ - cd iODBCdemo/DemoUnicode; $(PROJBUILD) install DSTROOT=$(DESTDIR)/ - cd iODBCtest; $(PROJBUILD) install DSTROOT=$(DESTDIR)/ - cd iODBCtestw; $(PROJBUILD) install DSTROOT=$(DESTDIR)/ + cd iODBCdemo/DemoAnsi; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Applications/iODBC + cd iODBCdemo/DemoUnicode; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Applications/iODBC + cd iODBCtest; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Library/Application\ Support/iODBC/bin + cd iODBCtestw; $(PROJBUILD_UNI) install DSTROOT=$(DESTDIR)/Library/Application\ Support/iODBC/bin # @@ -202,16 +213,16 @@ install: # clean: rm -rf include - cd iODBC; $(PROJBUILD) clean - cd iODBCinst; $(PROJBUILD) clean - cd iODBCtest; $(PROJBUILD) clean - cd iODBCtestw; $(PROJBUILD) clean - cd iODBCdrvproxy; $(PROJBUILD) clean - cd iODBCadm; $(PROJBUILD) clean - cd iODBCadministrator; $(PROJBUILD) clean - cd iODBCadministrator64; $(PROJBUILD) clean - cd iODBCdemo/DemoAnsi; $(PROJBUILD) clean - cd iODBCdemo/DemoUnicode; $(PROJBUILD) clean + cd iODBC; $(PROJBUILD_UNI) clean + cd iODBCinst; $(PROJBUILD_UNI) clean + cd iODBCtest; $(PROJBUILD_UNI) clean + cd iODBCtestw; $(PROJBUILD_UNI) clean + cd iODBCdrvproxy; $(PROJBUILD_UNI) clean + cd iODBCadm; $(PROJBUILD_UNI) clean + cd iODBCadministrator; $(PROJBUILD_UNI) clean + cd iODBCadministrator64; $(PROJBUILD_X64) clean + cd iODBCdemo/DemoAnsi; $(PROJBUILD_UNI) clean + cd iODBCdemo/DemoUnicode; $(PROJBUILD_UNI) clean realclean: clean diff --git a/mac/iODBC/iODBC.xcodeproj/project.pbxproj b/mac/iODBC/iODBC.xcodeproj/project.pbxproj index c06e49a6..523e7c61 100644 --- a/mac/iODBC/iODBC.xcodeproj/project.pbxproj +++ b/mac/iODBC/iODBC.xcodeproj/project.pbxproj @@ -712,9 +712,10 @@ ../../iodbc, ); INFOPLIST_FILE = "Info-iODBC.plist"; - INSTALL_PATH = /Library/Frameworks; + INSTALL_PATH = "."; /* set /Library/Frameworks makefile to avoid cycle errors */ + DYLIB_INSTALL_NAME_BASE = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.core; PRODUCT_NAME = iODBC; @@ -763,7 +764,8 @@ ../../iodbcinst, ); INFOPLIST_FILE = "Info-iODBC.plist"; - INSTALL_PATH = /Library/Frameworks; + INSTALL_PATH = "."; /* set /Library/Frameworks makefile to avoid cycle errors */ + DYLIB_INSTALL_NAME_BASE = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.9; OTHER_CFLAGS = "-fno-constant-cfstrings"; diff --git a/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj b/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 1512bb92..201c91b4 --- a/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj +++ b/mac/iODBCadm/iODBCadm.xcodeproj/project.pbxproj @@ -590,10 +590,11 @@ ); HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = "Info-iODBCadm.plist"; - INSTALL_PATH = /; + INSTALL_PATH = "."; /* set /Library/Frameworks makefile to avoid cycle errors */ + DYLIB_INSTALL_NAME_BASE = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = BUNDLE; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", @@ -642,10 +643,11 @@ ); HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = "Info-iODBCadm.plist"; - INSTALL_PATH = /; + INSTALL_PATH = "."; /* set /Library/Frameworks makefile to avoid cycle errors */ + DYLIB_INSTALL_NAME_BASE = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", @@ -703,8 +705,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; - ONLY_ACTIVE_ARCH = YES; + MACOSX_DEPLOYMENT_TARGET = 10.13; + ONLY_ACTIVE_ARCH = NO; STRIP_INSTALLED_PRODUCT = NO; }; name = Development; @@ -746,7 +748,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; STRIP_INSTALLED_PRODUCT = NO; }; name = Deployment; diff --git a/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj b/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 82507500..572f1780 --- a/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj +++ b/mac/iODBCadministrator/iODBCadministrator.xcodeproj/project.pbxproj @@ -29,7 +29,7 @@ 858A02D21B787ED900C8009C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 858A02D41B787EE500C8009C /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 858A02D51B787EE500C8009C /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 858A02DB1B7883E300C8009C /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; + 858A02DB1B7883E300C8009C /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; 85D1BBC707E7D7C90070A59E /* iODBC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iODBC.framework; path = ../../mac/iODBC/build/iODBC.framework; sourceTree = SOURCE_ROOT; }; CDAE3B890987D655003250F8 /* Info-iODBC_Administrator.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iODBC_Administrator.plist"; sourceTree = ""; }; CDAE3B8A0987D655003250F8 /* iODBC Administrator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iODBC Administrator.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -164,7 +164,7 @@ dependencies = ( ); name = "iODBC Administrator"; - productInstallPath = /Applications/iODBC; + productInstallPath = ""; /* set /Applications/iODBC in makefile to avoid cycle error */ productName = "iODBC Administrator"; productReference = CDAE3B8A0987D655003250F8 /* iODBC Administrator.app */; productType = "com.apple.product-type.application"; @@ -282,16 +282,16 @@ CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = $IODBC_VERSION; - DEPLOYMENT_POSTPROCESSING = YES; - DYLIB_COMPATIBILITY_VERSION = ""; + /* DEPLOYMENT_POSTPROCESSING = YES; */ + /* DYLIB_COMPATIBILITY_VERSION = ""; */ DYLIB_CURRENT_VERSION = $IODBC_VERSION; FRAMEWORK_SEARCH_PATHS = ( - ../../mac/iODBC/build/Deployment, + ../../mac/iODBC/build/Development, ../../mac/iODBC/build, - ../../mac/iODBCinst/build/Deployment, + ../../mac/iODBCinst/build/Development, ../../mac/iODBCinst/build, ); - FRAMEWORK_VERSION = 3.52; + /* FRAMEWORK_VERSION = 3.52; */ GCC_DYNAMIC_NO_PIC = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = 2; @@ -302,9 +302,9 @@ ); HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; - INSTALL_PATH = /Applications/iODBC; + INSTALL_PATH = "."; /* set /Applications/iODBC in makefile to avoid cycle error */ LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -317,7 +317,7 @@ PRODUCT_NAME = "iODBC Administrator"; RESMERGER_SOURCES_FORK = data; SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; + SKIP_INSTALL = NO; WARNING_CFLAGS = ( "-Wmost", "-Wno-four-char-constants", @@ -352,9 +352,9 @@ ); HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; - INSTALL_PATH = /Applications/iODBC; + INSTALL_PATH = "."; /* set /Applications/iODBC in makefile to avoid cycle error */ LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -366,6 +366,7 @@ PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.iODBCAdministrator; PRODUCT_NAME = "iODBC Administrator"; SECTORDER_FLAGS = ""; + SKIP_INSTALL = NO; WARNING_CFLAGS = ( "-Wmost", "-Wno-four-char-constants", @@ -411,8 +412,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; - ONLY_ACTIVE_ARCH = YES; + MACOSX_DEPLOYMENT_TARGET = 10.13; + ONLY_ACTIVE_ARCH = NO; }; name = Development; }; @@ -450,7 +451,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; }; name = Deployment; }; diff --git a/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj b/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 69296bdf..a2c16043 --- a/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj +++ b/mac/iODBCadministrator64/iODBCadministrator64.xcodeproj/project.pbxproj @@ -29,7 +29,7 @@ 858A02D21B787ED900C8009C /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 858A02D41B787EE500C8009C /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 858A02D51B787EE500C8009C /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 858A02DB1B7883E300C8009C /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; + 858A02DB1B7883E300C8009C /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; 85D1BBC707E7D7C90070A59E /* iODBC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iODBC.framework; path = ../../mac/iODBC/build/iODBC.framework; sourceTree = SOURCE_ROOT; }; CD75BBFB2637000B00ED5683 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = ../Base.lproj/MainMenu.xib; sourceTree = ""; }; CD75BBFC2637001000ED5683 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = ../en.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -164,7 +164,7 @@ dependencies = ( ); name = "iODBC Administrator64"; - productInstallPath = /Applications/iODBC; + productInstallPath = ""; /* set /Applications/iODBC in makefile to avoid cycle errors */ productName = "iODBC Administrator64"; productReference = CDAE3B8A0987D655003250F8 /* iODBC Administrator64.app */; productType = "com.apple.product-type.application"; @@ -283,9 +283,9 @@ DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = $IODBC_VERSION; FRAMEWORK_SEARCH_PATHS = ( - ../../mac/iODBC/build/Deployment, + ../../mac/iODBC/build/Development, ../../mac/iODBC/build, - ../../mac/iODBCinst/build/Deployment, + ../../mac/iODBCinst/build/Development, ../../mac/iODBCinst/build, ); FRAMEWORK_VERSION = 3.52; @@ -299,9 +299,9 @@ ); HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; - INSTALL_PATH = /Applications/iODBC; + INSTALL_PATH = "."; /* set /Applications/iODBC in makefile to avoid cycle errors */ LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -314,7 +314,7 @@ PRODUCT_NAME = "iODBC Administrator64"; RESMERGER_SOURCES_FORK = data; SECTORDER_FLAGS = ""; - SKIP_INSTALL = YES; + SKIP_INSTALL = NO; WARNING_CFLAGS = ( "-Wmost", "-Wno-four-char-constants", @@ -346,9 +346,9 @@ ); HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = "Info-iODBC_Administrator.plist"; - INSTALL_PATH = /Applications/iODBC; + INSTALL_PATH = "."; /* set /Applications/iODBC in makefile to avoid cycle errors */ LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( @@ -360,6 +360,7 @@ PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.iODBCAdministrator64; PRODUCT_NAME = "iODBC Administrator64"; SECTORDER_FLAGS = ""; + SKIP_INSTALL = NO; WARNING_CFLAGS = ( "-Wmost", "-Wno-four-char-constants", @@ -402,7 +403,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; ONLY_ACTIVE_ARCH = YES; }; name = Development; @@ -438,7 +439,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; }; name = Deployment; }; diff --git a/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj b/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index e46b4748..1cd81048 --- a/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj +++ b/mac/iODBCdemo/DemoAnsi/DemoAnsi.xcodeproj/project.pbxproj @@ -152,7 +152,7 @@ dependencies = ( ); name = "iODBC Demo Ansi"; - productInstallPath = /Applications/iODBC; + productInstallPath = "."; /* set /Applications/iODBC in makefile to avoid cycle error */ productName = "iODBC Demo Ansi"; productReference = CD7C37B70A063F40001A43B7 /* iODBC Demo Ansi.app */; productType = "com.apple.product-type.application"; @@ -293,9 +293,9 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( - ../../mac/iODBC/build/Deployment, + ../../mac/iODBC/build/Development, ../../mac/iODBC/build, - ../../mac/iODBCinst/build/Deployment, + ../../mac/iODBCinst/build/Development, ../../mac/iODBCinst/build, ); GCC_NO_COMMON_BLOCKS = YES; @@ -306,8 +306,8 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../include; - MACOSX_DEPLOYMENT_TARGET = 10.9; - ONLY_ACTIVE_ARCH = YES; + MACOSX_DEPLOYMENT_TARGET = 10.13; + ONLY_ACTIVE_ARCH = NO; }; name = Development; }; @@ -353,7 +353,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../include; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; }; name = Deployment; }; @@ -364,9 +364,9 @@ CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( - ../../../mac/iODBC/build/Deployment, + ../../../mac/iODBC/build/Development, ../../../mac/iODBC/build, - ../../../mac/iODBCinst/build/Deployment, + ../../../mac/iODBCinst/build/Development, ../../../mac/iODBCinst/build, ); GCC_DYNAMIC_NO_PIC = NO; @@ -374,7 +374,7 @@ GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoAnsi.plist; - INSTALL_PATH = /Applications/iODBC; + INSTALL_PATH = "."; /* set /Applications/iODBC in makefile to avoid cycle error */ PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-ansi"; PRODUCT_NAME = "iODBC Demo Ansi"; WRAPPER_EXTENSION = app; @@ -396,9 +396,10 @@ GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoAnsi.plist; - INSTALL_PATH = /Applications/iODBC; + INSTALL_PATH = "."; /* set /Applications/iODBC in makefile to avoid cycle error */ PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-ansi"; PRODUCT_NAME = "iODBC Demo Ansi"; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = app; }; name = Deployment; diff --git a/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj b/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 1dd1fa1a..e7667bc6 --- a/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj +++ b/mac/iODBCdemo/DemoUnicode/DemoUnicode.xcodeproj/project.pbxproj @@ -166,7 +166,7 @@ dependencies = ( ); name = "iODBC Demo Unicode"; - productInstallPath = /Applications/iODBC; + productInstallPath = "."; /* set /Applications/iODBC in makefile to avoid cycle error */ productName = "iODBC Demo Unicode"; productReference = 8D1107320486CEB800E47090 /* iODBC Demo Unicode.app */; productType = "com.apple.product-type.application"; @@ -290,9 +290,9 @@ CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( - ../../../mac/iODBC/build/Deployment, + ../../../mac/iODBC/build/Development, ../../../mac/iODBC/build, - ../../../mac/iODBCinst/build/Deployment, + ../../../mac/iODBCinst/build/Development, ../../../mac/iODBCinst/build, ); GCC_DYNAMIC_NO_PIC = NO; @@ -300,7 +300,7 @@ GCC_OPTIMIZATION_LEVEL = 0; HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoUnicode.plist; - INSTALL_PATH = /Applications/iODBC; + INSTALL_PATH = "."; /* set /Applications/iODBC in makefile to avoid cycle error */ OTHER_CFLAGS = "-DUNICODE"; PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-unicode"; PRODUCT_NAME = "iODBC Demo Unicode"; @@ -328,10 +328,11 @@ GCC_MODEL_TUNING = G5; HEADER_SEARCH_PATHS = ../../include; INFOPLIST_FILE = InfoUnicode.plist; - INSTALL_PATH = /Applications/iODBC; + INSTALL_PATH = "."; /* set /Applications/iODBC in makefile to avoid cycle error */ OTHER_CFLAGS = "-DUNICODE"; PRODUCT_BUNDLE_IDENTIFIER = "com.openlinksw.iodbcdemo-unicode"; PRODUCT_NAME = "iODBC Demo Unicode"; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = app; }; name = Deployment; @@ -366,9 +367,9 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = ( - ../../../mac/iODBC/build/Deployment, + ../../../mac/iODBC/build/Development, ../../../mac/iODBC/build, - ../../../mac/iODBCinst/build/Deployment, + ../../../mac/iODBCinst/build/Development, ../../../mac/iODBCinst/build, ); GCC_NO_COMMON_BLOCKS = YES; @@ -379,8 +380,8 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../include; - MACOSX_DEPLOYMENT_TARGET = 10.9; - ONLY_ACTIVE_ARCH = YES; + MACOSX_DEPLOYMENT_TARGET = 10.13; + ONLY_ACTIVE_ARCH = NO; }; name = Development; }; @@ -426,7 +427,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ../../include; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; }; name = Deployment; }; diff --git a/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj b/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 543b9618..24af4f41 --- a/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj +++ b/mac/iODBCdrvproxy/iODBCdrvproxy.xcodeproj/project.pbxproj @@ -402,7 +402,7 @@ INSTALL_PATH = /; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Bundle; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", @@ -453,7 +453,7 @@ INFOPLIST_FILE = "Info-iODBCdrvproxy.plist"; INSTALL_PATH = /; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; OTHER_LDFLAGS = ( "-multiply_defined", @@ -511,8 +511,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; - ONLY_ACTIVE_ARCH = YES; + MACOSX_DEPLOYMENT_TARGET = 10.13; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ""; STRIP_INSTALLED_PRODUCT = NO; }; @@ -553,7 +553,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = ""; }; name = Deployment; diff --git a/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj b/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 4e16d689..46092f5f --- a/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj +++ b/mac/iODBCinst/iODBCinst.xcodeproj/project.pbxproj @@ -66,7 +66,7 @@ 71DF013606A3E372007AF56B /* iodbcunix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = iodbcunix.h; path = ../../include/iodbcunix.h; sourceTree = SOURCE_ROOT; }; 7C530B5E07F075A7000BBF8D /* unicode.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = unicode.c; path = ../../iodbcinst/unicode.c; sourceTree = SOURCE_ROOT; }; 7C530B6007F075D3000BBF8D /* unicode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = unicode.h; path = ../../iodbcinst/unicode.h; sourceTree = SOURCE_ROOT; }; - CD2616E108B138FD00D9BE06 /* iodbcinst.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = iodbcinst.h; path = ../include/iodbcinst.h; sourceTree = SOURCE_ROOT; }; + CD2616E108B138FD00D9BE06 /* iodbcinst.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = iodbcinst.h; path = ../../include/iodbcinst.h; sourceTree = SOURCE_ROOT; }; CD9487182636F68B00DBD85F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = ../en.lproj/InfoPlist.strings; sourceTree = ""; }; CDAE3B100987CDA2003250F8 /* Info-iODBCinst.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iODBCinst.plist"; sourceTree = ""; }; CDAE3B110987CDA2003250F8 /* iODBCinst.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = iODBCinst.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -284,8 +284,8 @@ buildConfigurationList = CDAE3B0C0987CDA2003250F8 /* Build configuration list for PBXNativeTarget "iODBCinst" */; buildPhases = ( CDAE3AD20987CDA2003250F8 /* Headers */, - CDAE3AE30987CDA2003250F8 /* Resources */, CDAE3AE50987CDA2003250F8 /* Sources */, + CDAE3AE30987CDA2003250F8 /* Resources */, CDAE3B090987CDA2003250F8 /* Frameworks */, CDAE3B0B0987CDA2003250F8 /* Rez */, ); @@ -294,7 +294,7 @@ dependencies = ( ); name = iODBCinst; - productInstallPath = /Library/Frameworks; + productInstallPath = "."; /* set /Library/Frameworks makefile to avoid cycle errors */ productName = iODBCinst; productReference = CDAE3B110987CDA2003250F8 /* iODBCinst.framework */; productType = "com.apple.product-type.framework"; @@ -444,8 +444,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; - ONLY_ACTIVE_ARCH = YES; + MACOSX_DEPLOYMENT_TARGET = 10.13; + ONLY_ACTIVE_ARCH = NO; }; name = Development; }; @@ -484,7 +484,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; }; name = Deployment; }; @@ -516,9 +516,10 @@ ../../iodbc, ); INFOPLIST_FILE = "Info-iODBCinst.plist"; - INSTALL_PATH = /Library/Frameworks; + INSTALL_PATH = "."; /* set /Library/Frameworks makefile to avoid cycle errors */ + DYLIB_INSTALL_NAME_BASE = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.inst; PRODUCT_NAME = iODBCinst; @@ -561,9 +562,10 @@ ../../iodbc, ); INFOPLIST_FILE = "Info-iODBCinst.plist"; - INSTALL_PATH = /Library/Frameworks; + INSTALL_PATH = "."; /* set /Library/Frameworks makefile to avoid cycle errors */ + DYLIB_INSTALL_NAME_BASE = /Library/Frameworks; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; OTHER_CFLAGS = "-fno-constant-cfstrings"; PRODUCT_BUNDLE_IDENTIFIER = org.iodbc.inst; PRODUCT_NAME = iODBCinst; diff --git a/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj b/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index fd26f297..380e4e30 --- a/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj +++ b/mac/iODBCtest/iODBCtest.xcodeproj/project.pbxproj @@ -95,7 +95,7 @@ dependencies = ( ); name = iodbctest; - productInstallPath = "/Library/Application Support/iODBC/bin"; + productInstallPath = "."; /* set "/Library/Application Support/iODBC/bin" in makefile to avoid cycle error */ productName = iodbctest; productReference = CDAE3B380987CEF4003250F8 /* iodbctest */; productType = "com.apple.product-type.tool"; @@ -172,7 +172,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ""; HEADER_SEARCH_PATHS = ../../include; - INSTALL_PATH = "/Library/Application Support/iODBC/bin"; + INSTALL_PATH = "."; /* set "/Library/Application Support/iODBC/bin" in makefile to avoid cycle error */ LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; @@ -207,7 +207,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = 2; HEADER_SEARCH_PATHS = ../../include; - INSTALL_PATH = "/Library/Application Support/iODBC/bin"; + INSTALL_PATH = "."; /* set "/Library/Application Support/iODBC/bin" in makefile to avoid cycle error */ LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; @@ -259,8 +259,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; - ONLY_ACTIVE_ARCH = YES; + MACOSX_DEPLOYMENT_TARGET = 10.13; + ONLY_ACTIVE_ARCH = NO; }; name = Development; }; @@ -298,7 +298,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; }; name = Deployment; }; diff --git a/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj b/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj old mode 100644 new mode 100755 index 329a9d78..debda924 --- a/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj +++ b/mac/iODBCtestw/iODBCtestw.xcodeproj/project.pbxproj @@ -95,7 +95,7 @@ dependencies = ( ); name = iodbctestw; - productInstallPath = "/Library/Application Support/iODBC/bin"; + productInstallPath = "."; /* set "/Library/Application Support/iODBC/bin" in makefile to avoid cycle error */ productName = iodbctestw; productReference = CDAE3B5A0987CF60003250F8 /* iodbctestw */; productType = "com.apple.product-type.tool"; @@ -172,7 +172,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = UNICODE; HEADER_SEARCH_PATHS = ../../include; - INSTALL_PATH = "/Library/Application Support/iODBC/bin"; + INSTALL_PATH = "."; /* set "/Library/Application Support/iODBC/bin" in makefile to avoid cycle error */ LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; @@ -206,7 +206,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = 2; HEADER_SEARCH_PATHS = ../../include; - INSTALL_PATH = "/Library/Application Support/iODBC/bin"; + INSTALL_PATH = "."; /* set "/Library/Application Support/iODBC/bin" in makefile to avoid cycle error */ LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ""; OTHER_REZFLAGS = ""; @@ -258,8 +258,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; - ONLY_ACTIVE_ARCH = YES; + MACOSX_DEPLOYMENT_TARGET = 10.13; + ONLY_ACTIVE_ARCH = NO; }; name = Development; }; @@ -297,7 +297,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.13; }; name = Deployment; }; From d2dbea4c837c767388239b67a77e141141e7092d Mon Sep 17 00:00:00 2001 From: 1R053 <1121003+1R053@users.noreply.github.com> Date: Tue, 4 Feb 2025 23:19:19 +0100 Subject: [PATCH 4/5] Update README_MACOSX.md Co-authored-by: Ted Thibodeau Jr --- README_MACOSX.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_MACOSX.md b/README_MACOSX.md index 456ebd86..7eaf8666 100755 --- a/README_MACOSX.md +++ b/README_MACOSX.md @@ -22,7 +22,7 @@ cd mac make ``` -In case there are errors first try to clean up temporary files: +If there are errors, first try to clean up temporary files: ```shell sudo make clean From 04e6de24f7f0f08e3f05f03aa1aab2bab7cb00fe Mon Sep 17 00:00:00 2001 From: 1R053 <1121003+1R053@users.noreply.github.com> Date: Tue, 4 Feb 2025 23:19:29 +0100 Subject: [PATCH 5/5] Update README_MACOSX.md Co-authored-by: Ted Thibodeau Jr --- README_MACOSX.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_MACOSX.md b/README_MACOSX.md index 7eaf8666..9eab7122 100755 --- a/README_MACOSX.md +++ b/README_MACOSX.md @@ -34,7 +34,7 @@ After building the iODBC libraries and applications, you have to install them on sudo make install ``` -For generating and installing a development build with debug symbols run: +To generate and install a development build with debug symbols, run: ```shell sudo make realclean