From 8ad0b7e8e3562a4c5b1669ab7e06293601d9a66b Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Thu, 3 Nov 2016 22:42:10 -0700 Subject: [PATCH] Updated projects to Xcode recommendations. --- Audio/CogAudio.xcodeproj/project.pbxproj | 14 +++---- Cog.xcodeproj/project.pbxproj | 42 +++++++++++++++++-- .../xcshareddata/xcschemes/Cog.xcscheme | 2 +- .../Dumb/Dumb.xcodeproj/project.pbxproj | 14 +++---- .../FLAC/flac.xcodeproj/project.pbxproj | 14 +++---- .../File_Extractor.xcodeproj/project.pbxproj | 22 ++++------ Frameworks/GME/GME.xcodeproj/project.pbxproj | 14 +++---- .../HighlyAdvanced.xcodeproj/project.pbxproj | 8 ---- .../project.pbxproj | 10 ++--- .../HighlyQuixotic.xcodeproj/project.pbxproj | 14 +++---- .../project.pbxproj | 14 +++---- .../HivelyPlayer.xcodeproj/project.pbxproj | 10 ++--- .../MPCDec/MPCDec.xcodeproj/project.pbxproj | 14 +++---- .../NDHotKey.xcodeproj/project.pbxproj | 14 +++---- .../Ogg/macosx/Ogg.xcodeproj/project.pbxproj | 14 +++---- .../Opus/Opus.xcodeproj/project.pbxproj | 14 +++---- .../SSEQPlayer.xcodeproj/project.pbxproj | 14 +++---- .../Shorten/Shorten.xcodeproj/project.pbxproj | 14 +++---- Frameworks/Sparkle | 2 +- .../Syntrax_c.xcodeproj/project.pbxproj | 10 +---- .../TagLib/TagLib.xcodeproj/project.pbxproj | 14 +++---- .../macosx/Vorbis.xcodeproj/project.pbxproj | 14 +++---- .../WavPack/WavPack.xcodeproj/project.pbxproj | 14 +++---- .../lazyusf/lazyusf.xcodeproj/project.pbxproj | 16 +++---- .../sidplayfp.xcodeproj/project.pbxproj | 14 +++---- .../midi_processing.xcodeproj/project.pbxproj | 14 +++---- .../modplay/modplay.xcodeproj/project.pbxproj | 8 ---- .../playptmod.xcodeproj/project.pbxproj | 10 ++--- .../psflib/psflib.xcodeproj/project.pbxproj | 14 +++---- .../vgmstream.xcodeproj/project.pbxproj | 7 ---- .../vio2sf/vio2sf.xcodeproj/project.pbxproj | 14 +++---- Plugins/APL/APL.xcodeproj/project.pbxproj | 13 +++--- .../ArchiveSource.xcodeproj/project.pbxproj | 12 +++--- .../BASSMODS.xcodeproj/project.pbxproj | 20 ++++----- .../CoreAudio.xcodeproj/project.pbxproj | 13 +++--- .../CueSheet.xcodeproj/project.pbxproj | 12 +++--- Plugins/Dumb/Dumb.xcodeproj/project.pbxproj | 15 +++---- .../FFMPEG/FFMPEG.xcodeproj/project.pbxproj | 14 +++---- .../FileSource.xcodeproj/project.pbxproj | 12 +++--- Plugins/Flac/Flac.xcodeproj/project.pbxproj | 12 +++--- Plugins/GME/GME.xcodeproj/project.pbxproj | 12 +++--- .../HTTPSource.xcodeproj/project.pbxproj | 12 +++--- .../HighlyComplete.xcodeproj/project.pbxproj | 21 ++++------ .../Hively/Hively.xcodeproj/project.pbxproj | 10 ++--- Plugins/M3u/M3u.xcodeproj/project.pbxproj | 12 +++--- Plugins/MIDI/MIDI.xcodeproj/project.pbxproj | 12 +++--- .../Musepack.xcodeproj/project.pbxproj | 12 +++--- Plugins/Opus/Opus.xcodeproj/project.pbxproj | 12 +++--- Plugins/Pls/Pls.xcodeproj/project.pbxproj | 12 +++--- .../Shorten/Shorten.xcodeproj/project.pbxproj | 13 +++--- .../SilenceDecoder.xcodeproj/project.pbxproj | 12 +++--- .../Syntrax/Syntrax.xcodeproj/project.pbxproj | 13 +----- .../TagLib/TagLib.xcodeproj/project.pbxproj | 12 +++--- .../Vorbis/Vorbis.xcodeproj/project.pbxproj | 12 +++--- .../WavPack/WavPack.xcodeproj/project.pbxproj | 13 +++--- .../modplay/modplay.xcodeproj/project.pbxproj | 8 ---- .../playptmod.xcodeproj/project.pbxproj | 10 ++--- .../sidplay/sidplay.xcodeproj/project.pbxproj | 10 ++--- .../vgmstream.xcodeproj/project.pbxproj | 5 --- .../General/General.xcodeproj/project.pbxproj | 13 +++--- 60 files changed, 305 insertions(+), 467 deletions(-) diff --git a/Audio/CogAudio.xcodeproj/project.pbxproj b/Audio/CogAudio.xcodeproj/project.pbxproj index 3991394c1..575f81852 100644 --- a/Audio/CogAudio.xcodeproj/project.pbxproj +++ b/Audio/CogAudio.xcodeproj/project.pbxproj @@ -362,7 +362,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0810; TargetAttributes = { 8DC2EF4F0486A6940098B216 = { DevelopmentTeam = N6E749HJ2X; @@ -430,10 +430,8 @@ 1DEB91AE08733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = N6E749HJ2X; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ""; @@ -461,9 +459,7 @@ 1DEB91AF08733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = N6E749HJ2X; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ""; @@ -492,12 +488,12 @@ CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Developer ID Application"; COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = N6E749HJ2X; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -524,12 +520,12 @@ CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Developer ID Application"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = N6E749HJ2X; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index e4b913f8d..aecaec6eb 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -432,6 +432,20 @@ remoteGlobalIDString = 8314D6311A354DFE00EEE8E6; remoteInfo = sidplay; }; + 8333B6581DCC4290004C140D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83E6B750181612FD00D4576D /* Sparkle.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 726B2B5D1C645FC900388755; + remoteInfo = "UI Tests"; + }; + 8333B65A1DCC4290004C140D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83E6B750181612FD00D4576D /* Sparkle.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 722954B41D04ADAF00ECF9CA; + remoteInfo = fileop; + }; 8359FF3017FEF35D0060F3ED /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8359FF2C17FEF35C0060F3ED /* ArchiveSource.xcodeproj */; @@ -1740,6 +1754,8 @@ 83E6B75D181612FD00D4576D /* Sparkle Unit Tests.xctest */, 83E6B75F181612FD00D4576D /* BinaryDelta */, 83E6B761181612FD00D4576D /* Autoupdate.app */, + 8333B6591DCC4290004C140D /* UI Tests.xctest */, + 8333B65B1DCC4290004C140D /* fileop */, ); name = Products; sourceTree = ""; @@ -1935,7 +1951,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0810; TargetAttributes = { 8D1107260486CEB800E47090 = { DevelopmentTeam = N6E749HJ2X; @@ -2210,6 +2226,20 @@ remoteRef = 8314D6401A354DFF00EEE8E6 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 8333B6591DCC4290004C140D /* UI Tests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "UI Tests.xctest"; + remoteRef = 8333B6581DCC4290004C140D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 8333B65B1DCC4290004C140D /* fileop */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = fileop; + remoteRef = 8333B65A1DCC4290004C140D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 8359FF3117FEF35D0060F3ED /* ArchiveSource.bundle */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; @@ -2456,7 +2486,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "${PROJECT_DIR}/Scripts/genversion.sh"; + shellScript = "${PROJECT_DIR}/Scripts/genversion.sh\ncodesign -f -s \"${CODE_SIGN_IDENTITY}\" --deep \"${CONFIGURATION_BUILD_DIR}/${PRODUCT_NAME}.app\""; }; /* End PBXShellScriptBuildPhase section */ @@ -2807,6 +2837,7 @@ "-D__MACOSX__", "-DHAVE_CONFIG_H", ); + OTHER_CODE_SIGN_FLAGS = "--deep -f"; OTHER_LDFLAGS = ( "-weak_framework", CogAudio, @@ -2835,7 +2866,7 @@ "-D__MACOSX__", "-DHAVE_CONFIG_H", ); - OTHER_CODE_SIGN_FLAGS = ""; + OTHER_CODE_SIGN_FLAGS = "--deep -f"; OTHER_LDFLAGS = ( "-weak_framework", CogAudio, @@ -2844,7 +2875,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.cogx.cog; PRODUCT_NAME = Cog; - PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; WRAPPER_EXTENSION = app; }; @@ -2859,7 +2889,9 @@ CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; @@ -2889,7 +2921,9 @@ CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; diff --git a/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme b/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme index 5530d4f54..e4b4e821e 100644 --- a/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme +++ b/Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme @@ -1,6 +1,6 @@