diff options
3 files changed, 16 insertions, 8 deletions
| diff --git a/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj b/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj index bfef322de..4658ed67b 100644 --- a/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj +++ b/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj @@ -223,10 +223,10 @@  		28D516D91830FFCA0047C93D /* mac_cursor_busy@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D61830FFCA0047C93D /* mac_cursor_busy@2x.png */; };  		28D516DA1830FFCA0047C93D /* mac_cursor_flipped@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D71830FFCA0047C93D /* mac_cursor_flipped@2x.png */; };  		28FDA42119B6967B00BE27D7 /* LexBibTeX.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28FDA42019B6967B00BE27D7 /* LexBibTeX.cxx */; }; +		3D994BD7A5EAC4FA5B3CFBDF /* LexMaxima.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 29B042978C1F93EF42F9E4AB /* LexMaxima.cxx */; };  		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };  		8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };  		F437405F9F32C7DEFCA38C11 /* LexIndent.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 282E41F3B9E2BFEDD6A05BE7 /* LexIndent.cxx */; }; -		3D994BD7A5EAC4FA5B3CFBDF /* LexMaxima.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 29B042978C1F93EF42F9E4AB /* LexMaxima.cxx */; };  /* End PBXBuildFile section */  /* Begin PBXFileReference section */ @@ -452,11 +452,11 @@  		28D516D61830FFCA0047C93D /* mac_cursor_busy@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mac_cursor_busy@2x.png"; sourceTree = "<group>"; };  		28D516D71830FFCA0047C93D /* mac_cursor_flipped@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mac_cursor_flipped@2x.png"; sourceTree = "<group>"; };  		28FDA42019B6967B00BE27D7 /* LexBibTeX.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexBibTeX.cxx; path = ../../lexers/LexBibTeX.cxx; sourceTree = "<group>"; }; +		29B042978C1F93EF42F9E4AB /* LexMaxima.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMaxima.cxx; path = ../../lexers/LexMaxima.cxx; sourceTree = SOURCE_ROOT; };  		32DBCF5E0370ADEE00C91783 /* Scintilla_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scintilla_Prefix.pch; sourceTree = "<group>"; };  		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };  		8DC2EF5B0486A6940098B216 /* Scintilla.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Scintilla.framework; sourceTree = BUILT_PRODUCTS_DIR; };  		D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; }; -		29B042978C1F93EF42F9E4AB /* LexMaxima.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexMaxima.cxx; path = ../../lexers/LexMaxima.cxx; sourceTree = SOURCE_ROOT; };  /* End PBXFileReference section */  /* Begin PBXFrameworksBuildPhase section */ @@ -918,7 +918,7 @@  		0867D690FE84028FC02AAC07 /* Project object */ = {  			isa = PBXProject;  			attributes = { -				LastUpgradeCheck = 0900; +				LastUpgradeCheck = 0930;  			};  			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ScintillaFramework" */;  			compatibilityVersion = "Xcode 3.2"; @@ -1204,11 +1204,13 @@  				CLANG_WARN_BOOL_CONVERSION = YES;  				CLANG_WARN_COMMA = YES;  				CLANG_WARN_CONSTANT_CONVERSION = YES; +				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;  				CLANG_WARN_EMPTY_BODY = YES;  				CLANG_WARN_ENUM_CONVERSION = YES;  				CLANG_WARN_INFINITE_RECURSION = YES;  				CLANG_WARN_INT_CONVERSION = YES;  				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; +				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;  				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;  				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;  				CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -1247,11 +1249,13 @@  				CLANG_WARN_BOOL_CONVERSION = YES;  				CLANG_WARN_COMMA = YES;  				CLANG_WARN_CONSTANT_CONVERSION = YES; +				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;  				CLANG_WARN_EMPTY_BODY = YES;  				CLANG_WARN_ENUM_CONVERSION = YES;  				CLANG_WARN_INFINITE_RECURSION = YES;  				CLANG_WARN_INT_CONVERSION = YES;  				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; +				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;  				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;  				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;  				CLANG_WARN_STRICT_PROTOTYPES = YES; diff --git a/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/xcshareddata/xcschemes/Scintilla.xcscheme b/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/xcshareddata/xcschemes/Scintilla.xcscheme index 1834cd5cd..f8aabeef4 100644 --- a/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/xcshareddata/xcschemes/Scintilla.xcscheme +++ b/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/xcshareddata/xcschemes/Scintilla.xcscheme @@ -1,6 +1,6 @@  <?xml version="1.0" encoding="UTF-8"?>  <Scheme -   LastUpgradeVersion = "0900" +   LastUpgradeVersion = "0930"     version = "1.3">     <BuildAction        parallelizeBuildables = "YES" @@ -26,7 +26,6 @@        buildConfiguration = "Debug"        selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"        selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" -      language = ""        shouldUseLaunchSchemeArgsEnv = "YES">        <Testables>        </Testables> @@ -38,7 +37,6 @@        selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"        selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"        enableAddressSanitizer = "YES" -      language = ""        launchStyle = "0"        useCustomWorkingDirectory = "NO"        ignoresPersistentStateOnLaunch = "NO" diff --git a/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj b/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj index 75fb0cd02..6934a5a57 100644 --- a/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj +++ b/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@  		271FA52C0F850BE20033D021 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 271FA52B0F850BE20033D021 /* AppController.mm */; };  		2791F4490FC1A8E9009DBCF9 /* TestData.sql in Resources */ = {isa = PBXBuildFile; fileRef = 2791F4480FC1A8E9009DBCF9 /* TestData.sql */; };  		27AF7EC30FC2C351007160EF /* Scintilla.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2744E5EA0FC16BE200E85C33 /* Scintilla.framework */; }; -		27AF7ECA0FC2C388007160EF /* Scintilla.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2744E5EA0FC16BE200E85C33 /* Scintilla.framework */; }; +		27AF7ECA0FC2C388007160EF /* Scintilla.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2744E5EA0FC16BE200E85C33 /* Scintilla.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };  		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };  		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };  		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -191,7 +191,7 @@  		29B97313FDCFA39411CA2CEA /* Project object */ = {  			isa = PBXProject;  			attributes = { -				LastUpgradeCheck = 0920; +				LastUpgradeCheck = 0930;  			};  			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ScintillaTest" */;  			compatibilityVersion = "Xcode 3.2"; @@ -285,6 +285,7 @@  			isa = XCBuildConfiguration;  			buildSettings = {  				ALWAYS_SEARCH_USER_PATHS = NO; +				CLANG_ENABLE_OBJC_WEAK = YES;  				COMBINE_HIDPI_IMAGES = YES;  				COPY_PHASE_STRIP = NO;  				FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -310,6 +311,7 @@  			isa = XCBuildConfiguration;  			buildSettings = {  				ALWAYS_SEARCH_USER_PATHS = NO; +				CLANG_ENABLE_OBJC_WEAK = YES;  				COMBINE_HIDPI_IMAGES = YES;  				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";  				FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -337,11 +339,13 @@  				CLANG_WARN_BOOL_CONVERSION = YES;  				CLANG_WARN_COMMA = YES;  				CLANG_WARN_CONSTANT_CONVERSION = YES; +				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;  				CLANG_WARN_EMPTY_BODY = YES;  				CLANG_WARN_ENUM_CONVERSION = YES;  				CLANG_WARN_INFINITE_RECURSION = YES;  				CLANG_WARN_INT_CONVERSION = YES;  				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; +				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;  				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;  				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;  				CLANG_WARN_STRICT_PROTOTYPES = YES; @@ -374,11 +378,13 @@  				CLANG_WARN_BOOL_CONVERSION = YES;  				CLANG_WARN_COMMA = YES;  				CLANG_WARN_CONSTANT_CONVERSION = YES; +				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;  				CLANG_WARN_EMPTY_BODY = YES;  				CLANG_WARN_ENUM_CONVERSION = YES;  				CLANG_WARN_INFINITE_RECURSION = YES;  				CLANG_WARN_INT_CONVERSION = YES;  				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; +				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;  				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;  				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;  				CLANG_WARN_STRICT_PROTOTYPES = YES; | 
