From 991df6ee7fe5b1a8f10415e2e8d9a57c3c3c0141 Mon Sep 17 00:00:00 2001 From: Jens Ayton Date: Sat, 12 Jan 2019 20:46:10 +0100 Subject: [PATCH 1/4] Mac: Target macOS 10.7 and libc++ --- Doc/CHANGELOG.TXT | 7 +++++++ src/Cocoa/Info-Oolite.plist | 2 +- src/Cocoa/OOMacSnowLeopardFullScreenController.h | 2 +- src/Cocoa/OOMacSystemStandardFullScreenController.m | 8 +------- src/Cocoa/oolite-targets.xcconfig | 4 +++- src/Core/Debug/OODebugTCPConsoleClient.h | 6 +++--- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Doc/CHANGELOG.TXT b/Doc/CHANGELOG.TXT index 492c66f81..a6c41427b 100644 --- a/Doc/CHANGELOG.TXT +++ b/Doc/CHANGELOG.TXT @@ -19,6 +19,13 @@ Scripting: Bug fixes: ========== +System requirements: +==================== + +Mac-specific +------------ +* Oolite now requires Mac OS X 10.7 or later. + ------------------------------------------------------------------------------- Changes between Oolite 1.86 and Oolite 1.88: diff --git a/src/Cocoa/Info-Oolite.plist b/src/Cocoa/Info-Oolite.plist index ca95364f1..10fbcf6d1 100644 --- a/src/Cocoa/Info-Oolite.plist +++ b/src/Cocoa/Info-Oolite.plist @@ -86,7 +86,7 @@ LSMinimumSystemVersionByArchitecture x86_64 - 10.6.0 + 10.7.0 NSAppTransportSecurity diff --git a/src/Cocoa/OOMacSnowLeopardFullScreenController.h b/src/Cocoa/OOMacSnowLeopardFullScreenController.h index c79054e3e..cd511a020 100644 --- a/src/Cocoa/OOMacSnowLeopardFullScreenController.h +++ b/src/Cocoa/OOMacSnowLeopardFullScreenController.h @@ -2,7 +2,7 @@ OOMacSnowLeopardFullScreenController.h -Full-screen controller used in 64-bit Mac builds under Mac OS X 10.6. +Full-screen controller used in Mac OS X 10.7 with multiple screens. Oolite diff --git a/src/Cocoa/OOMacSystemStandardFullScreenController.m b/src/Cocoa/OOMacSystemStandardFullScreenController.m index 9453abefe..92bf73257 100644 --- a/src/Cocoa/OOMacSystemStandardFullScreenController.m +++ b/src/Cocoa/OOMacSystemStandardFullScreenController.m @@ -43,13 +43,7 @@ @implementation OOMacSystemStandardFullScreenController + (BOOL) shouldUseSystemStandardFullScreenController { - if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_6) - { - // Never on 10.6 or earlier; the necessary API doesn't exist. - return NO; - } - - // If safe to use, allow override for debugging. + // Allow override for debugging. NSString *override = [[NSUserDefaults standardUserDefaults] stringForKey:@"full-screen-mode-override"]; if (override != nil) { diff --git a/src/Cocoa/oolite-targets.xcconfig b/src/Cocoa/oolite-targets.xcconfig index 39a54c80d..287ed95e6 100644 --- a/src/Cocoa/oolite-targets.xcconfig +++ b/src/Cocoa/oolite-targets.xcconfig @@ -3,8 +3,10 @@ ARCHS = x86_64 SDKROOT = macosx -MACOSX_DEPLOYMENT_TARGET = 10.6 +MACOSX_DEPLOYMENT_TARGET = 10.7 GCC_VERSION = com.apple.compilers.llvm.clang.1_0 CLANG_ENABLE_MODULES = YES + +CLANG_CXX_LIBRARY = libc++ diff --git a/src/Core/Debug/OODebugTCPConsoleClient.h b/src/Core/Debug/OODebugTCPConsoleClient.h index 91aa74d42..3b7283b9b 100644 --- a/src/Core/Debug/OODebugTCPConsoleClient.h +++ b/src/Core/Debug/OODebugTCPConsoleClient.h @@ -64,9 +64,9 @@ typedef enum #if OOLITE_MAC_OS_X /* - Declare conformance to NSStreamDelegate, which is a formal protocol starting - in the Mac OS X 10.6 SDK. At the time of writing, it's still an informal - protocol in GNUstep trunk. -- Ahruman 2012-01-07 + Declare conformance to NSStreamDelegate, which is a formal protocol in the + Mac OS X SDK. At the time of writing, it's still an informal protocol in + GNUstep trunk. -- Ahruman 2012-01-07 */ @interface OODebugTCPConsoleClient (NSStreamDelegate) @end From 574102c276b68dba9f876e45e38a1e83325d8f7a Mon Sep 17 00:00:00 2001 From: Jens Ayton Date: Sun, 13 Jan 2019 13:38:50 +0100 Subject: [PATCH 2/4] Mac: Modernize project files and xibs --- Oolite.xcodeproj/project.pbxproj | 54 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcschemes/Oolite - Debug.xcscheme | 2 +- .../xcschemes/Oolite - Deployment.xcscheme | 2 +- .../xcschemes/Oolite - Test Release.xcscheme | 2 +- .../Ogg Vorbis/Ogg.xcodeproj/project.pbxproj | 15 +- .../Vorbis.xcodeproj/project.pbxproj | 15 +- .../libjs/libjs.xcodeproj/project.pbxproj | 57 +- .../libpng/libpng.xcodeproj/project.pbxproj | 12 +- src/Cocoa/Oolite.xib | 2043 +++-------------- 10 files changed, 462 insertions(+), 1748 deletions(-) create mode 100644 Oolite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Oolite.xcodeproj/project.pbxproj b/Oolite.xcodeproj/project.pbxproj index 5eff4f3dd..2a78ed3b2 100644 --- a/Oolite.xcodeproj/project.pbxproj +++ b/Oolite.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 47; + objectVersion = 50; objects = { /* Begin PBXAggregateTarget section */ @@ -3481,11 +3481,11 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 0730; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "the Oolite team"; }; buildConfigurationList = 08B31CB008FE63D70038D42F /* Build configuration list for PBXProject "Oolite" */; - compatibilityVersion = "Xcode 6.3"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -4026,6 +4026,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 1ABFEE2110507987005AA752 /* oolite-nonshared.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; COPY_SCHEMATA = 1; @@ -4063,7 +4064,17 @@ PRODUCT_BUNDLE_IDENTIFIER = org.aegidian.oolite; PRODUCT_NAME = Oolite; SECTORDER_FLAGS = ""; - USER_HEADER_SEARCH_PATHS = "\"$(DEPS_INCLUDE_PATH)/ogg\" \"$(DEPS_INCLUDE_PATH)/js\" \"$(DEPS_INCLUDE_PATH)/vorbis\" \"$(DEPS_INCLUDE_PATH)/png\" \"$(SRCROOT)/src/Core/\" \"$(SRCROOT)/src/Core/Tables/\" \"$(SRCROOT)/src/Core/Entites/\" \"$(SRCROOT)/src/Core/Materials/\" \"$(SRCROOT)/src/BSDCompat/\""; + USER_HEADER_SEARCH_PATHS = ( + "\"$(DEPS_INCLUDE_PATH)/ogg\"", + "\"$(DEPS_INCLUDE_PATH)/js\"", + "\"$(DEPS_INCLUDE_PATH)/vorbis\"", + "\"$(DEPS_INCLUDE_PATH)/png\"", + "\"$(SRCROOT)/src/Core/\"", + "\"$(SRCROOT)/src/Core/Tables/\"", + "\"$(SRCROOT)/src/Core/Entites/\"", + "\"$(SRCROOT)/src/Core/Materials/\"", + "\"$(SRCROOT)/src/BSDCompat/\"", + ); WARNING_CFLAGS = $OO_WARNING_FLAGS; WRAPPER_EXTENSION = app; }; @@ -4073,6 +4084,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 1ABFEE2110507987005AA752 /* oolite-nonshared.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEPS_INCLUDE_PATH = "$(SYMROOT)/$(CONFIGURATION)/include"; @@ -4105,7 +4117,17 @@ PRODUCT_BUNDLE_IDENTIFIER = org.aegidian.oolite; PRODUCT_NAME = Oolite; SECTORDER_FLAGS = ""; - USER_HEADER_SEARCH_PATHS = "\"$(DEPS_INCLUDE_PATH)/ogg\" \"$(DEPS_INCLUDE_PATH)/js\" \"$(DEPS_INCLUDE_PATH)/vorbis\" \"$(DEPS_INCLUDE_PATH)/png\" \"$(SRCROOT)/src/Core/\" \"$(SRCROOT)/src/Core/Tables/\" \"$(SRCROOT)/src/Core/Entites/\" \"$(SRCROOT)/src/Core/Materials/\" \"$(SRCROOT)/src/BSDCompat/\""; + USER_HEADER_SEARCH_PATHS = ( + "\"$(DEPS_INCLUDE_PATH)/ogg\"", + "\"$(DEPS_INCLUDE_PATH)/js\"", + "\"$(DEPS_INCLUDE_PATH)/vorbis\"", + "\"$(DEPS_INCLUDE_PATH)/png\"", + "\"$(SRCROOT)/src/Core/\"", + "\"$(SRCROOT)/src/Core/Tables/\"", + "\"$(SRCROOT)/src/Core/Entites/\"", + "\"$(SRCROOT)/src/Core/Materials/\"", + "\"$(SRCROOT)/src/BSDCompat/\"", + ); WARNING_CFLAGS = $OO_WARNING_FLAGS; WRAPPER_EXTENSION = app; }; @@ -4120,11 +4142,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; @@ -4155,11 +4179,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; @@ -4182,6 +4208,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 1ABFEE2110507987005AA752 /* oolite-nonshared.xcconfig */; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; COPY_SCHEMATA = 1; @@ -4210,7 +4237,17 @@ PRODUCT_BUNDLE_IDENTIFIER = org.aegidian.oolite; PRODUCT_NAME = Oolite; SECTORDER_FLAGS = ""; - USER_HEADER_SEARCH_PATHS = "\"$(DEPS_INCLUDE_PATH)/ogg\" \"$(DEPS_INCLUDE_PATH)/js\" \"$(DEPS_INCLUDE_PATH)/vorbis\" \"$(DEPS_INCLUDE_PATH)/png\" \"$(SRCROOT)/src/Core/\" \"$(SRCROOT)/src/Core/Tables/\" \"$(SRCROOT)/src/Core/Entites/\" \"$(SRCROOT)/src/Core/Materials/\" \"$(SRCROOT)/src/BSDCompat/\""; + USER_HEADER_SEARCH_PATHS = ( + "\"$(DEPS_INCLUDE_PATH)/ogg\"", + "\"$(DEPS_INCLUDE_PATH)/js\"", + "\"$(DEPS_INCLUDE_PATH)/vorbis\"", + "\"$(DEPS_INCLUDE_PATH)/png\"", + "\"$(SRCROOT)/src/Core/\"", + "\"$(SRCROOT)/src/Core/Tables/\"", + "\"$(SRCROOT)/src/Core/Entites/\"", + "\"$(SRCROOT)/src/Core/Materials/\"", + "\"$(SRCROOT)/src/BSDCompat/\"", + ); WARNING_CFLAGS = $OO_WARNING_FLAGS; WRAPPER_EXTENSION = app; }; @@ -4225,11 +4262,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; @@ -4251,6 +4290,7 @@ 1AD267690C8305A200B4BFD1 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; OOLITE_INCUDE_DEBUG_BUNDLE = 1; PRODUCT_NAME = "Build All"; @@ -4260,6 +4300,7 @@ 1AD2676A0C8305A200B4BFD1 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; OOLITE_INCUDE_DEBUG_BUNDLE = 0; PRODUCT_NAME = "Build All"; @@ -4269,6 +4310,7 @@ 1AD2676B0C8305A200B4BFD1 /* TestRelease */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; OOLITE_INCUDE_DEBUG_BUNDLE = 1; PRODUCT_NAME = "Build All"; diff --git a/Oolite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Oolite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/Oolite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Debug.xcscheme b/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Debug.xcscheme index 0fa8adda5..35edb71fd 100644 --- a/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Debug.xcscheme +++ b/Oolite.xcodeproj/xcshareddata/xcschemes/Oolite - Debug.xcscheme @@ -1,6 +1,6 @@ - - - 1060 - 12E55 - 3084 - 1187.39 - 626.00 - - 3084 - 2053 - - - NSBox - NSCustomObject - NSCustomView - NSImageCell - NSImageView - NSMenu - NSMenuItem - NSTextField - NSTextFieldCell - NSUserDefaultsController - NSView - NSWindowTemplate - PDFView - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.pdfkit.ibplugin - - - PluginDependencyRecalculationVersion - - - - - OoliteApp - - - FirstResponder - - - NSApplication - - - MainMenu - - - - Oolite - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - Oolite - - - - About Oolite - - 2147483647 - - - - - - Check for Updates… - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Oolite Screen Shots - - 1048576 - 2147483647 - - - - - - Expansion Packs - - 1048576 - 2147483647 - - - - - - Show Previous Log - - 1048576 - 2147483647 - - - - - - YES - Logs Folder - - 524288 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide Oolite - h - 1048576 - 2147483647 - - - - - - Hide Others - H - 1048576 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit Oolite - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - Edit - - 1048576 - 2147483647 - - - submenuAction: - - - Edit - - - - - Undo - z - 1048576 - 2147483647 - - - - - - Redo - Z - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Cut - x - 1048576 - 2147483647 - - - - - - Copy - c - 1048576 - 2147483647 - - - - - - Paste - v - 1048576 - 2147483647 - - - - - - Paste and Match Style - V - 1572864 - 2147483647 - - - - - - Delete - - 1048576 - 2147483647 - - - - - - Select All - a - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - - Window - - - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - Close - w - 1048576 - 2147483647 - - - - - - Enter Full Screen - f - 1310720 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 1048576 - 2147483647 - - - submenuAction: - - - Help - - - - - Oolite Help - ? - 1048576 - 2147483647 - - - - - - - - _NSMainMenu - - - 9 - 2 - {{44, 222}, {640, 480}} - 1886912512 - Oolite - OOPrimaryWindow - - View - - - {640, 480} - - - 256 - - - - 18 - - - - 274 - - - - 298 - - - - 301 - - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - {{128, 41}, {384, 384}} - - - YES - - 134217728 - 33554432 - - NSImage - splash - - 0 - 1 - 0 - NO - - NO - YES - - - - 298 - {{17, 8}, {606, 17}} - - YES - - 67108864 - 138412032 - loading… - - LucidaGrande - 13 - 1044 - - - YES - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 1 - MC44MTU2MDgzMjI2IDAuODIwMTg5MTc4IDEAA - - - NO - - - {{0, 30}, {640, 424}} - - - NSView - - - {640, 480} - - - - - {640, 480} - - - {0, 0} - - 67108864 - 0 - - - LucidaGrande - 11 - 3100 - - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 0 - 4 - 0 - NO - - 1 - MCAwIDAAA - - - - {640, 480} - - - {{0, 0}, {1366, 746}} - {640, 502} - {10000000000000, 10000000000000} - oolite-main-window - 128 - YES - - - GameController - - - 15 - 2 - {{26, 348}, {640, 480}} - 1886912512 - Help - NSWindow - - View - - - {640, 400} - - - 256 - - - - 18 - - - NSFilenamesPboardType - - {640, 480} - - YES - 1 - NO - 1.0212417840957642 - YES - - - {640, 480} - - {{0, 0}, {1366, 746}} - {640, 422} - {10000000000000, 10000000000000} - oolitehelp - 256 - YES - - - 3 - 2 - {{50, 220}, {640, 480}} - 1886912512 - - Panel - - NSWindow - - View - - - {213, 107} - - - 256 - - - - 274 - {640, 480} - - MyOpenGLView - NSOpenGLView - - - {640, 480} - - {{0, 0}, {1366, 746}} - {213, 129} - {10000000000000, 10000000000000} - YES - - - YES - - - - - - - Show - - 2147483647 - - - submenuAction: - - Show - - - - Screen Shots - - 2147483647 - - - - - - Expansion Packs - - 2147483647 - - - - - - Previous Log - - 2147483647 - - - - - - YES - Logs Folder - - 524288 - 2147483647 - - - - - - - - - - SUUpdater - - - - - - - terminate: - - - - 139 - - - - hideOtherApplications: - - - - 146 - - - - hide: - - - - 152 - - - - unhideAllApplications: - - - - 153 - - - - delegate - - - - 207 - - - - orderFrontStandardAboutPanel: - - - - 273 - - - - _gameController - - - - 361 - - - - _gameWindow - - - - 362 - - - - pasteAsPlainText: - - - - 328 - - - - paste: - - - - 329 - - - - delete: - - - - 332 - - - - cut: - - - - 338 - - - - redo: - - - - 339 - - - - selectAll: - - - - 341 - - - - undo: - - - - 342 - - - - copy: - - - - 343 - - - - performZoom: - - - - 351 - - - - performMiniaturize: - - - - 352 - - - - arrangeInFront: - - - - 353 - - - - performClose: - - - - 358 - - - - delegate - - - - 241 - - - - initialFirstResponder - - - - 296 - - - - fullScreenDelegate - - - - 439 - - - - gameWindow - - - - 213 - - - - gameView - - - - 262 - - - - splashView - - - - 264 - - - - splashProgressTextField - - - - 271 - - - - showLogAction: - - - - 399 - - - - showAddOnsAction: - - - - 400 - - - - showSnapshotsAction: - - - - 409 - - - - dockMenu - - - - 423 - - - - showSnapshotsAction: - - - - 424 - - - - showAddOnsAction: - - - - 425 - - - - showLogAction: - - - - 426 - - - - showLogFolderAction: - - - - 427 - - - - showLogFolderAction: - - - - 429 - - - - helpView - - - - 437 - - - - toggleFullScreenAction: - - - - 438 - - - - makeKeyAndOrderFront: - - - - 228 - - - - gameController - - - - 265 - - - - checkForUpdates: - - - - 433 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - - - - - - - MainMenu - - - 56 - - - - - - - - 57 - - - - - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 136 - - - - - 144 - - - - - 145 - - - - - 149 - - - - - 150 - - - - - 381 - - - - - 382 - - - - - 383 - - - - - 384 - - - - - 103 - - - - - - - - 106 - - - - - - - - 111 - - - - - 299 - - - - - - - - 300 - - - - - - - - - - - - - - - - 301 - - - - - 302 - - - - - 303 - - - - - 305 - - - - - 313 - - - - - 319 - - - - - 320 - - - - - 325 - - - - - 326 - - - - - 345 - - - - - - - - 346 - - - - - - - - - - - - - 347 - - - - - 348 - - - - - 349 - - - - - 350 - - - - - 354 - - - - - 356 - - - - - 198 - - - - - - Main Window - - - 199 - - - - - - - - 205 - - - GameController - - - 225 - - - - - - Help Window - - - 224 - - - - - - - - 256 - - - - - - non-displayed Window - - - 257 - - - - - - - - 260 - - - - - 385 - - - Shared User Defaults Controller - - - 416 - - - - - - Dock menu - - - 417 - - - - - - - - 418 - - - - - - - - - - - 419 - - - - - 420 - - - - - 421 - - - - - 422 - - - - - 428 - - - - - 431 - - - - - 432 - - - - - 435 - - - - - - - - 360 - - - - - - - - - 261 - - - - - - - - 412 - - - - - 270 - - - - - - - - 413 - - - - - 436 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{274, 644}, {640, 480}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{358, 638}, {640, 480}} - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - OOPDFView - com.apple.pdfkit.ibplugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 439 - - - - - GameController - NSObject - - id - id - id - id - id - - - - showAddOnsAction: - id - - - showLogAction: - id - - - showLogFolderAction: - id - - - showSnapshotsAction: - id - - - toggleFullScreenAction: - id - - - - NSMenu - MyOpenGLView - NSWindow - PDFView - NSTextField - NSView - - - - dockMenu - NSMenu - - - gameView - MyOpenGLView - - - gameWindow - NSWindow - - - helpView - PDFView - - - splashProgressTextField - NSTextField - - - splashView - NSView - - - - IBProjectSource - ./Classes/GameController.h - - - - MyOpenGLView - NSOpenGLView - - IBProjectSource - ./Classes/MyOpenGLView.h - - - - OOPDFView - PDFView - - IBProjectSource - ./Classes/OOPDFView.h - - - - OOPrimaryWindow - NSWindow - - fullScreenDelegate - id - - - fullScreenDelegate - - fullScreenDelegate - id - - - - IBProjectSource - ./Classes/OOPrimaryWindow.h - - - - OoliteApp - NSApplication - - GameController - NSWindow - - - - _gameController - GameController - - - _gameWindow - NSWindow - - - - IBProjectSource - ./Classes/OoliteApp.h - - - - SUUpdater - NSObject - - checkForUpdates: - id - - - checkForUpdates: - - checkForUpdates: - id - - - - delegate - id - - - delegate - - delegate - id - - - - IBProjectSource - ./Classes/SUUpdater.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {11, 11} - {10, 3} - {384, 384} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 134f0ade35c82303885496be14a023f1396c0bf8 Mon Sep 17 00:00:00 2001 From: Jens Ayton Date: Sun, 13 Jan 2019 13:39:10 +0100 Subject: [PATCH 3/4] Mac: Deal with various warnings --- .../Ogg Vorbis/Ogg.xcodeproj/project.pbxproj | 6 ++--- src/Cocoa/MyOpenGLView.m | 25 +++++++------------ src/Cocoa/oolite-warnings.xcconfig | 6 ++++- src/Core/HeadUpDisplay.m | 1 - src/Core/OOCPUInfo.m | 2 +- src/Core/Scripting/OOConstToJSString.m | 7 ------ 6 files changed, 18 insertions(+), 29 deletions(-) diff --git a/deps/Cocoa-deps/Ogg Vorbis/Ogg.xcodeproj/project.pbxproj b/deps/Cocoa-deps/Ogg Vorbis/Ogg.xcodeproj/project.pbxproj index 17df89b4c..205d0042e 100644 --- a/deps/Cocoa-deps/Ogg Vorbis/Ogg.xcodeproj/project.pbxproj +++ b/deps/Cocoa-deps/Ogg Vorbis/Ogg.xcodeproj/project.pbxproj @@ -198,7 +198,7 @@ ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -252,7 +252,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -305,7 +305,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; diff --git a/src/Cocoa/MyOpenGLView.m b/src/Cocoa/MyOpenGLView.m index 1944e8b9d..10515eb27 100644 --- a/src/Cocoa/MyOpenGLView.m +++ b/src/Cocoa/MyOpenGLView.m @@ -369,24 +369,18 @@ - (NSData *)pixelFormatAttributes } -#ifdef MAC_OS_X_VERSION_10_7 // If building against 10.7 SDK, where relevant symbols are defined... - (void) viewDidMoveToWindow { - /* Subscribe to NSWindowDidChangeBackingPropertiesNotification on systems - which support it (10.7 and later). This notification fires when the - scale factor or colour space of the window's backing store changes. - We use it to track scale factor changes. + /* This notification fires when the scale factor or colour space of the + window's backing store changes. We use it to track scale factor changes. */ - if (&NSWindowDidChangeBackingPropertiesNotification != NULL && [self.window respondsToSelector:@selector(backingScaleFactor)]) - { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(backingPropertiesChanged:) - name:NSWindowDidChangeBackingPropertiesNotification - object:self.window]; - - // Also, ensure the initial state makes sense. - [self backingPropertiesChanged:nil]; - } + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(backingPropertiesChanged:) + name:NSWindowDidChangeBackingPropertiesNotification + object:self.window]; + + // Also, ensure the initial state makes sense. + [self backingPropertiesChanged:nil]; } @@ -394,7 +388,6 @@ - (void) backingPropertiesChanged:(NSNotification *)notification { GLSetDisplayScaleFactor(self.window.backingScaleFactor); } -#endif - (BOOL) snapShot:(NSString *)filename diff --git a/src/Cocoa/oolite-warnings.xcconfig b/src/Cocoa/oolite-warnings.xcconfig index be03f5b8b..9f2dd270a 100644 --- a/src/Cocoa/oolite-warnings.xcconfig +++ b/src/Cocoa/oolite-warnings.xcconfig @@ -48,7 +48,11 @@ OO_WARNING_EXCEPTIONS = -Wno-unused-parameter -Wno-missing-field-initializer // are incompatible with most real code. Including the C standard library. // -Wdouble-promotion: warns about implicit casts from float to double. We // have loads. Someone should fix them. -OO_EXTRA_WARNING_EXCEPTIONS = -Wno-pedantic -Wno-gnu -Wno-undef -Wno-objc-interface-ivars -Wno-direct-ivar-access -Wno-receiver-forward-class -Wno-padded -Wno-float-equal -Wno-switch-enum -Wno-cast-align -Wno-unused-exception-parameter -Wno-missing-noreturn -Wno-unreachable-code -Wno-used-but-marked-unused -Wno-format-nonliteral -Wno-conditional-uninitialized -Wno-bad-function-cast -Wno-assign-enum -Wno-vla -Wno-auto-import -Rno-module-build -Wno-cstring-format-directive -Wno-reserved-id-macro -Wno-nullable-to-nonnull-conversion -Wno-cast-qual -Wno-double-promotion $(OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_$(XCODE_VERSION_MINOR)) +// -Wobjc-messaging-id: Warning when the target of a message is of type 'id'. +// Avoiding this in idiomatic Objective-C is unrealistic. +// -Wstrict-prototypes: Not very relevant to Objective-C, and several +// violations in SpiderMonkey headers +OO_EXTRA_WARNING_EXCEPTIONS = -Wno-pedantic -Wno-gnu -Wno-undef -Wno-objc-interface-ivars -Wno-direct-ivar-access -Wno-receiver-forward-class -Wno-padded -Wno-float-equal -Wno-switch-enum -Wno-cast-align -Wno-unused-exception-parameter -Wno-missing-noreturn -Wno-unreachable-code -Wno-used-but-marked-unused -Wno-format-nonliteral -Wno-conditional-uninitialized -Wno-bad-function-cast -Wno-assign-enum -Wno-vla -Wno-auto-import -Rno-module-build -Wno-cstring-format-directive -Wno-reserved-id-macro -Wno-nullable-to-nonnull-conversion -Wno-cast-qual -Wno-double-promotion -Wno-objc-messaging-id -Wno-strict-prototypes $(OO_VERSION_SPECIFIC_WARNING_EXCEPTIONS_$(XCODE_VERSION_MINOR)) // Things we don't want to break the build when they're introduced by devs on other platforms. OO_WARNING_NO_ERROR = -Wno-error=deprecated-declarations -Wno-error=semicolon-before-method-body diff --git a/src/Core/HeadUpDisplay.m b/src/Core/HeadUpDisplay.m index 1757530c9..405462f43 100644 --- a/src/Core/HeadUpDisplay.m +++ b/src/Core/HeadUpDisplay.m @@ -194,7 +194,6 @@ @implementation HeadUpDisplay static const GLfloat yellow_color[4] = {1.0, 1.0, 0.0, 1.0}; static const GLfloat green_color[4] = {0.0, 1.0, 0.0, 1.0}; static const GLfloat darkgreen_color[4] = {0.0, 0.75, 0.0, 1.0}; -static const GLfloat cyan_color[4] = {0.0, 1.0, 1.0, 1.0}; static const GLfloat blue_color[4] = {0.0, 0.0, 1.0, 1.0}; static const GLfloat black_color[4] = {0.0, 0.0, 0.0, 1.0}; static const GLfloat lightgray_color[4] = {0.25, 0.25, 0.25, 1.0}; diff --git a/src/Core/OOCPUInfo.m b/src/Core/OOCPUInfo.m index 52287841f..fea94f9e9 100644 --- a/src/Core/OOCPUInfo.m +++ b/src/Core/OOCPUInfo.m @@ -128,7 +128,7 @@ NSUInteger OOCPUCount(void) } return [NSString stringWithCString:CPUBrandString]; #else - return [NSString stringWithString:@""]; + return @""; #endif } diff --git a/src/Core/Scripting/OOConstToJSString.m b/src/Core/Scripting/OOConstToJSString.m index 43e523b39..a871d8ac6 100644 --- a/src/Core/Scripting/OOConstToJSString.m +++ b/src/Core/Scripting/OOConstToJSString.m @@ -116,11 +116,6 @@ Initialize table contents (with C strings, see above) from table files. #include "OOLegalStatusReason.tbl" }; -static TableEntry sOOLongRangeChartModeTableEntries[] = -{ - #include "OOLongRangeChartMode.tbl" -}; - #undef ENTRY #undef GALACTIC_HYPERSPACE_ENTRY #undef DIFF_STRING_ENTRY @@ -134,7 +129,6 @@ Initialize table contents (with C strings, see above) from table files. ConstTable gOOViewIDConstTable = TABLE(sOOViewIDTableEntries); ConstTable gOOShipDamageTypeConstTable = TABLE(sOOShipDamageTypeTableEntries); ConstTable gOOLegalStatusReasonConstTable = TABLE(sOOLegalStatusReasonTableEntries); -ConstTable gOOLongRangeChartModeConstTable = TABLE(sOOLongRangeChartModeTableEntries); static void InitTable(JSContext *context, ConstTable *table); @@ -156,7 +150,6 @@ void OOConstToJSStringInit(JSContext *context) InitTable(context, &gOOViewIDConstTable); InitTable(context, &gOOShipDamageTypeConstTable); InitTable(context, &gOOLegalStatusReasonConstTable); - InitTable(context, &gOOLongRangeChartModeConstTable); sInited = YES; } From a4ccd4b14cbfc00874ae71b04be9ac09b0112517 Mon Sep 17 00:00:00 2001 From: Jens Ayton Date: Sun, 13 Jan 2019 13:46:15 +0100 Subject: [PATCH 4/4] Bump Mac-specific --- Mac-specific | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mac-specific b/Mac-specific index 90eb95257..80ff33ede 160000 --- a/Mac-specific +++ b/Mac-specific @@ -1 +1 @@ -Subproject commit 90eb952576bc41b8c1751a70bfcecb470a1e6db5 +Subproject commit 80ff33ede592b1252176226044e791345bc2b99f