From 0da9e942d319b27bef14a77719becbe669ff8222 Mon Sep 17 00:00:00 2001 From: macmade Date: Fri, 8 Mar 2024 00:37:09 +0100 Subject: [PATCH] chore: Deployment target is now macOS 10.11 --- Submodules/STDXS | 2 +- lib-macho/source/CacheFile.cpp | 2 +- lib-macho/source/FatFile.cpp | 2 +- lib-macho/source/File.cpp | 6 +++--- macho.xcodeproj/project.pbxproj | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Submodules/STDXS b/Submodules/STDXS index 5541d28..29128da 160000 --- a/Submodules/STDXS +++ b/Submodules/STDXS @@ -1 +1 @@ -Subproject commit 5541d28073491bacaa9f1f0ad126e801fb6b6822 +Subproject commit 29128dad56d4174ffd28e3de4d59e2757fe645f1 diff --git a/lib-macho/source/CacheFile.cpp b/lib-macho/source/CacheFile.cpp index b32f42f..9877ee9 100644 --- a/lib-macho/source/CacheFile.cpp +++ b/lib-macho/source/CacheFile.cpp @@ -89,7 +89,7 @@ namespace MachO if( this->impl->_path.has_value() ) { - i.value( XS::ToString::Filename( this->impl->_path.value() ) ); + i.value( XS::ToString::Filename( *( this->impl->_path ) ) ); } i.addChild( { "Header", this->header() } ); diff --git a/lib-macho/source/FatFile.cpp b/lib-macho/source/FatFile.cpp index caf127e..622f78f 100644 --- a/lib-macho/source/FatFile.cpp +++ b/lib-macho/source/FatFile.cpp @@ -81,7 +81,7 @@ namespace MachO if( this->impl->_path.has_value() ) { - i.value( XS::ToString::Filename( this->impl->_path.value() ) ); + i.value( XS::ToString::Filename( *( this->impl->_path ) ) ); } for( const auto & p: this->impl->_archs ) diff --git a/lib-macho/source/File.cpp b/lib-macho/source/File.cpp index 3dd2381..bf74520 100644 --- a/lib-macho/source/File.cpp +++ b/lib-macho/source/File.cpp @@ -116,7 +116,7 @@ namespace MachO return {}; } - const void * header = _dyld_get_image_header( index.value() ); + const void * header = _dyld_get_image_header( *( index ) ); if( header == nullptr ) { @@ -162,7 +162,7 @@ namespace MachO if( this->impl->_path.has_value() ) { - i.value( XS::ToString::Filename( this->impl->_path.value() ) ); + i.value( XS::ToString::Filename( *( this->impl->_path ) ) ); } commands.value( std::to_string( this->loadCommands().size() ) ); @@ -303,7 +303,7 @@ namespace MachO if( str.has_value() ) { - set.insert( str.value() ); + set.insert( *( str ) ); } } } diff --git a/macho.xcodeproj/project.pbxproj b/macho.xcodeproj/project.pbxproj index 2feeedc..2dffbea 100644 --- a/macho.xcodeproj/project.pbxproj +++ b/macho.xcodeproj/project.pbxproj @@ -922,7 +922,7 @@ "$(SRCROOT)/lib-macho/include/", "$(SRCROOT)/Submodules/STDXS/XS++/include/", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Debug; }; @@ -937,7 +937,7 @@ "$(SRCROOT)/lib-macho/include/", "$(SRCROOT)/Submodules/STDXS/XS++/include/", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Release; };