From 09485b7cf4bc5d00f37a97f8a1ec84c1189089b1 Mon Sep 17 00:00:00 2001 From: Madthijs Date: Tue, 11 May 2021 15:43:09 +0200 Subject: [PATCH] compile + hardened security --- .../AerofoilMac.xcodeproj/project.pbxproj | 22 ++++++++++++------- .../xcschemes/AerofoilMac.xcscheme | 12 +++++----- .../AerofoilMac/AerofoilMac.entitlements | 10 +++++---- AerofoilMac/AerofoilMac/Info.plist | 2 +- GpApp/House.cpp | 2 ++ 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/AerofoilMac/AerofoilMac.xcodeproj/project.pbxproj b/AerofoilMac/AerofoilMac.xcodeproj/project.pbxproj index eee54f3..0416bf5 100644 --- a/AerofoilMac/AerofoilMac.xcodeproj/project.pbxproj +++ b/AerofoilMac/AerofoilMac.xcodeproj/project.pbxproj @@ -589,7 +589,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 5C54D0962629B42100AB55E0 /* AerofoilMac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AerofoilMac.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 5C54D0962629B42100AB55E0 /* Aerofoil.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Aerofoil.app; sourceTree = BUILT_PRODUCTS_DIR; }; 5C54D09F2629B42400AB55E0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 5C54D0A22629B42400AB55E0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 5C54D0A42629B42400AB55E0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -1046,7 +1046,7 @@ 5C54D0972629B42100AB55E0 /* Products */ = { isa = PBXGroup; children = ( - 5C54D0962629B42100AB55E0 /* AerofoilMac.app */, + 5C54D0962629B42100AB55E0 /* Aerofoil.app */, 5C54D0B32629B5C600AB55E0 /* libAerofoilShared.a */, ); name = Products; @@ -1801,9 +1801,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 5C54D0952629B42100AB55E0 /* AerofoilMac */ = { + 5C54D0952629B42100AB55E0 /* Aerofoil */ = { isa = PBXNativeTarget; - buildConfigurationList = 5C54D0AA2629B42400AB55E0 /* Build configuration list for PBXNativeTarget "AerofoilMac" */; + buildConfigurationList = 5C54D0AA2629B42400AB55E0 /* Build configuration list for PBXNativeTarget "Aerofoil" */; buildPhases = ( 5C54D0922629B42100AB55E0 /* Sources */, 5C54D0932629B42100AB55E0 /* Frameworks */, @@ -1817,9 +1817,9 @@ dependencies = ( 5C54D684262D898F00AB55E0 /* PBXTargetDependency */, ); - name = AerofoilMac; + name = Aerofoil; productName = AerofoilMac; - productReference = 5C54D0962629B42100AB55E0 /* AerofoilMac.app */; + productReference = 5C54D0962629B42100AB55E0 /* Aerofoil.app */; productType = "com.apple.product-type.application"; }; 5C54D0B22629B5C600AB55E0 /* AerofoilShared */ = { @@ -1874,7 +1874,7 @@ ); projectRoot = ""; targets = ( - 5C54D0952629B42100AB55E0 /* AerofoilMac */, + 5C54D0952629B42100AB55E0 /* Aerofoil */, 5C54D0B22629B5C600AB55E0 /* AerofoilShared */, ); }; @@ -2330,6 +2330,8 @@ CODE_SIGN_ENTITLEMENTS = AerofoilMac/AerofoilMac.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = 3V3B8U8926; + ENABLE_HARDENED_RUNTIME = YES; GCC_C_LANGUAGE_STANDARD = c11; GCC_PREPROCESSOR_DEFINITIONS = ( __MACOS__, @@ -2345,6 +2347,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); + MARKETING_VERSION = 1.1.0; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.madthijs.AerofoilMac; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2360,6 +2363,8 @@ CODE_SIGN_ENTITLEMENTS = AerofoilMac/AerofoilMac.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = 3V3B8U8926; + ENABLE_HARDENED_RUNTIME = YES; GCC_C_LANGUAGE_STANDARD = c11; GCC_PREPROCESSOR_DEFINITIONS = ( __MACOS__, @@ -2376,6 +2381,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); + MARKETING_VERSION = 1.1.0; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.madthijs.AerofoilMac; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2438,7 +2444,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 5C54D0AA2629B42400AB55E0 /* Build configuration list for PBXNativeTarget "AerofoilMac" */ = { + 5C54D0AA2629B42400AB55E0 /* Build configuration list for PBXNativeTarget "Aerofoil" */ = { isa = XCConfigurationList; buildConfigurations = ( 5C54D0AB2629B42400AB55E0 /* Debug */, diff --git a/AerofoilMac/AerofoilMac.xcodeproj/xcshareddata/xcschemes/AerofoilMac.xcscheme b/AerofoilMac/AerofoilMac.xcodeproj/xcshareddata/xcschemes/AerofoilMac.xcscheme index e8c8de1..3911638 100644 --- a/AerofoilMac/AerofoilMac.xcodeproj/xcshareddata/xcschemes/AerofoilMac.xcscheme +++ b/AerofoilMac/AerofoilMac.xcodeproj/xcshareddata/xcschemes/AerofoilMac.xcscheme @@ -15,8 +15,8 @@ @@ -45,8 +45,8 @@ @@ -68,8 +68,8 @@ diff --git a/AerofoilMac/AerofoilMac/AerofoilMac.entitlements b/AerofoilMac/AerofoilMac/AerofoilMac.entitlements index f2ef3ae..782cf2d 100644 --- a/AerofoilMac/AerofoilMac/AerofoilMac.entitlements +++ b/AerofoilMac/AerofoilMac/AerofoilMac.entitlements @@ -2,9 +2,11 @@ - com.apple.security.app-sandbox - - com.apple.security.files.user-selected.read-only - + com.apple.security.app-sandbox + + com.apple.security.cs.disable-library-validation + + com.apple.security.files.user-selected.read-only + diff --git a/AerofoilMac/AerofoilMac/Info.plist b/AerofoilMac/AerofoilMac/Info.plist index 873bb68..af98330 100644 --- a/AerofoilMac/AerofoilMac/Info.plist +++ b/AerofoilMac/AerofoilMac/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + $(MARKETING_VERSION) CFBundleVersion 1 LSApplicationCategoryType diff --git a/GpApp/House.cpp b/GpApp/House.cpp index f00ccc5..22c97d8 100644 --- a/GpApp/House.cpp +++ b/GpApp/House.cpp @@ -264,6 +264,8 @@ Boolean InitializeEmptyHouseInEditor (void) UpdateMenus(false); ReflectCurrentRoom(true); + + return (true); } #endif