diff --git a/CMakeLists.txt b/CMakeLists.txt index 42de0cb4c..de51d6266 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,8 +64,20 @@ if (${CMAKE_C_COMPILER_ID} STREQUAL "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} SET(IGNORED_WARNINGS "${IGNORED_WARNINGS} -Wno-expansion-to-defined") endif (${CMAKE_C_COMPILER_ID} STREQUAL "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS "3.9") +if(${CMAKE_C_COMPILER_ID} STREQUAL "Clang" AND ${CMAKE_C_COMPILER_VERSION} VERSION_GREATER_EQUAL "11") + # newer Clang chokes on the idiomatic way to use CF_ENUM; e.g. like this: + # typedef CF_ENUM(int, MyEnum) { + # MY_ENUM_THING, + # MY_ENUM_OTHER_THING, + # # etc... + # } + set(IGNORED_WARNINGS "${IGNORED_WARNINGS} -Wno-elaborated-enum-base -Wno-undef-prefix") + set(ASM_IGNORED_WARNINGS "${ASM_IGNORED_WARNINGS} -Wno-undef-prefix") +endif() + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IGNORED_WARNINGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNORED_WARNINGS}") +set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${ASM_IGNORED_WARNINGS}") SET(CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb") diff --git a/src/external/cocotron b/src/external/cocotron index e3915265a..75d6ef46a 160000 --- a/src/external/cocotron +++ b/src/external/cocotron @@ -1 +1 @@ -Subproject commit e3915265a8230a67ef538e700826b7c8f624d6bb +Subproject commit 75d6ef46a741fdced73ac5e36af95a7ad076fc83 diff --git a/src/external/corefoundation b/src/external/corefoundation index 0b5e5ea20..eb27048b5 160000 --- a/src/external/corefoundation +++ b/src/external/corefoundation @@ -1 +1 @@ -Subproject commit 0b5e5ea2022e714fdb99287a974279bb4f5b0e08 +Subproject commit eb27048b559d749f043a1e29273ba3646c6a4f6e diff --git a/src/external/file_cmds b/src/external/file_cmds index 7d158dfbc..192a2bfdc 160000 --- a/src/external/file_cmds +++ b/src/external/file_cmds @@ -1 +1 @@ -Subproject commit 7d158dfbc4299e037ce71b3212e90858ef88a1b8 +Subproject commit 192a2bfdc693f8766acb912b9e11aae4ec1d75a3 diff --git a/src/external/foundation b/src/external/foundation index efcf08f81..20604d187 160000 --- a/src/external/foundation +++ b/src/external/foundation @@ -1 +1 @@ -Subproject commit efcf08f812f69e0df5f7b6db6ce449e3a2485d5f +Subproject commit 20604d187fcb4848edb572ad9a1f7c63c06dac2b diff --git a/src/external/gnutar b/src/external/gnutar index 51a0e19d7..d2533785d 160000 --- a/src/external/gnutar +++ b/src/external/gnutar @@ -1 +1 @@ -Subproject commit 51a0e19d7d664812df7b19ba2d6eef48fc19f8f1 +Subproject commit d2533785d5dcb3c724cd289465c8239aa1734d31 diff --git a/src/external/remote_cmds b/src/external/remote_cmds index 18de96a49..3bb9f8872 160000 --- a/src/external/remote_cmds +++ b/src/external/remote_cmds @@ -1 +1 @@ -Subproject commit 18de96a4956704458d30a6bab0a24d31f629506b +Subproject commit 3bb9f88724726d0d3073c04dfdc4785564113341 diff --git a/src/external/security b/src/external/security index 4c14bf33e..38bc40c87 160000 --- a/src/external/security +++ b/src/external/security @@ -1 +1 @@ -Subproject commit 4c14bf33ee5a8010e3f5f01b95b1f65a212606dd +Subproject commit 38bc40c87b179ef27e44c6a1c61d12a5c75641fb diff --git a/src/external/tcsh b/src/external/tcsh index 1daedbfe2..cc4a2ac60 160000 --- a/src/external/tcsh +++ b/src/external/tcsh @@ -1 +1 @@ -Subproject commit 1daedbfe2b29cdefa14433844921002d3eec11cd +Subproject commit cc4a2ac60d6c5b7ab0b946e1e5469af8bb888e60 diff --git a/src/external/text_cmds b/src/external/text_cmds index bb1e50057..4da4aa30f 160000 --- a/src/external/text_cmds +++ b/src/external/text_cmds @@ -1 +1 @@ -Subproject commit bb1e500575d810739a6d78bcdeaa69f0d8c8d2dd +Subproject commit 4da4aa30f7f5a3266b0f82e8e890ea8fb599241e diff --git a/src/external/top b/src/external/top index 8b88619c1..8b5da40fc 160000 --- a/src/external/top +++ b/src/external/top @@ -1 +1 @@ -Subproject commit 8b88619c1bb8eac981ecb1bd794417e89c394ddd +Subproject commit 8b5da40fc2c3d44b91c7d0fbb3367167d7152d91 diff --git a/src/frameworks/AVFoundation/include/AVFoundation/AVAnimation.h b/src/frameworks/AVFoundation/include/AVFoundation/AVAnimation.h index 98bea3e6d..1c1b04082 100644 --- a/src/frameworks/AVFoundation/include/AVFoundation/AVAnimation.h +++ b/src/frameworks/AVFoundation/include/AVFoundation/AVAnimation.h @@ -2,6 +2,6 @@ typedef NSString *AVLayerVideoGravity; -const AVLayerVideoGravity AVLayerVideoGravityResize; -const AVLayerVideoGravity AVLayerVideoGravityResizeAspect; -const AVLayerVideoGravity AVLayerVideoGravityResizeAspectFill; +extern const AVLayerVideoGravity AVLayerVideoGravityResize; +extern const AVLayerVideoGravity AVLayerVideoGravityResizeAspect; +extern const AVLayerVideoGravity AVLayerVideoGravityResizeAspectFill; diff --git a/src/frameworks/AVFoundation/include/AVFoundation/AVAsset.h b/src/frameworks/AVFoundation/include/AVFoundation/AVAsset.h index e1399c986..369088a1e 100644 --- a/src/frameworks/AVFoundation/include/AVFoundation/AVAsset.h +++ b/src/frameworks/AVFoundation/include/AVFoundation/AVAsset.h @@ -19,7 +19,7 @@ #include -NSString *const AVURLAssetPreferPreciseDurationAndTimingKey; +extern NSString *const AVURLAssetPreferPreciseDurationAndTimingKey; @interface AVAsset : NSObject diff --git a/src/frameworks/AVFoundation/include/AVFoundation/AVAssetExportSession.h b/src/frameworks/AVFoundation/include/AVFoundation/AVAssetExportSession.h index 161d367d7..29e95bac0 100644 --- a/src/frameworks/AVFoundation/include/AVFoundation/AVAssetExportSession.h +++ b/src/frameworks/AVFoundation/include/AVFoundation/AVAssetExportSession.h @@ -19,9 +19,9 @@ #include -NSString *const AVAssetExportPresetHighestQuality; -NSString *const AVAssetExportPresetMediumQuality; -NSString *const AVAssetExportPresetLowQuality; +extern NSString *const AVAssetExportPresetHighestQuality; +extern NSString *const AVAssetExportPresetMediumQuality; +extern NSString *const AVAssetExportPresetLowQuality; @interface AVAssetExportSession : NSObject diff --git a/src/frameworks/AVFoundation/include/AVFoundation/AVAudioSettings.h b/src/frameworks/AVFoundation/include/AVFoundation/AVAudioSettings.h index ddb41ce6c..ec84a097f 100644 --- a/src/frameworks/AVFoundation/include/AVFoundation/AVAudioSettings.h +++ b/src/frameworks/AVFoundation/include/AVFoundation/AVAudioSettings.h @@ -1,8 +1,8 @@ #import -NSString *const AVChannelLayoutKey; -NSString *const AVEncoderBitRateChannelKey; -NSString *const AVFormatIDKey; -NSString *const AVLinearPCMBitDepthKey; -NSString *const AVNumberOfChannelsKey; -NSString *const AVSampleRateKey; +extern NSString *const AVChannelLayoutKey; +extern NSString *const AVEncoderBitRateChannelKey; +extern NSString *const AVFormatIDKey; +extern NSString *const AVLinearPCMBitDepthKey; +extern NSString *const AVNumberOfChannelsKey; +extern NSString *const AVSampleRateKey; diff --git a/src/frameworks/AVFoundation/include/AVFoundation/AVCaptureSession.h b/src/frameworks/AVFoundation/include/AVFoundation/AVCaptureSession.h index 98ef4c1e0..fd99e2ad8 100644 --- a/src/frameworks/AVFoundation/include/AVFoundation/AVCaptureSession.h +++ b/src/frameworks/AVFoundation/include/AVFoundation/AVCaptureSession.h @@ -21,25 +21,25 @@ typedef NSString *AVCaptureSessionPreset; -NSString *const AVCaptureDeviceWasConnectedNotification; -NSString *const AVCaptureDeviceWasDisconnectedNotification; -NSString *const AVCaptureSessionDidStartRunningNotification; -NSString *const AVCaptureSessionDidStopRunningNotification; -NSString *const AVCaptureSessionErrorKey; -NSString *const AVCaptureSessionRuntimeErrorNotification; - -const AVCaptureSessionPreset AVCaptureSessionPreset3840x2160; -const AVCaptureSessionPreset AVCaptureSessionPreset1920x1080; -const AVCaptureSessionPreset AVCaptureSessionPreset1280x720; -const AVCaptureSessionPreset AVCaptureSessionPreset960x540; -const AVCaptureSessionPreset AVCaptureSessionPreset640x480; -const AVCaptureSessionPreset AVCaptureSessionPreset352x288; -const AVCaptureSessionPreset AVCaptureSessionPreset320x240; -const AVCaptureSessionPreset AVCaptureSessionPresetiFrame1280x720; -const AVCaptureSessionPreset AVCaptureSessionPresetiFrame960x540; -const AVCaptureSessionPreset AVCaptureSessionPresetHigh; -const AVCaptureSessionPreset AVCaptureSessionPresetLow; -const AVCaptureSessionPreset AVCaptureSessionPresetMedium; +extern NSString *const AVCaptureDeviceWasConnectedNotification; +extern NSString *const AVCaptureDeviceWasDisconnectedNotification; +extern NSString *const AVCaptureSessionDidStartRunningNotification; +extern NSString *const AVCaptureSessionDidStopRunningNotification; +extern NSString *const AVCaptureSessionErrorKey; +extern NSString *const AVCaptureSessionRuntimeErrorNotification; + +extern const AVCaptureSessionPreset AVCaptureSessionPreset3840x2160; +extern const AVCaptureSessionPreset AVCaptureSessionPreset1920x1080; +extern const AVCaptureSessionPreset AVCaptureSessionPreset1280x720; +extern const AVCaptureSessionPreset AVCaptureSessionPreset960x540; +extern const AVCaptureSessionPreset AVCaptureSessionPreset640x480; +extern const AVCaptureSessionPreset AVCaptureSessionPreset352x288; +extern const AVCaptureSessionPreset AVCaptureSessionPreset320x240; +extern const AVCaptureSessionPreset AVCaptureSessionPresetiFrame1280x720; +extern const AVCaptureSessionPreset AVCaptureSessionPresetiFrame960x540; +extern const AVCaptureSessionPreset AVCaptureSessionPresetHigh; +extern const AVCaptureSessionPreset AVCaptureSessionPresetLow; +extern const AVCaptureSessionPreset AVCaptureSessionPresetMedium; @interface AVCaptureSession : NSObject diff --git a/src/frameworks/AVFoundation/include/AVFoundation/AVError.h b/src/frameworks/AVFoundation/include/AVFoundation/AVError.h index bbfaddc91..a66e480f6 100644 --- a/src/frameworks/AVFoundation/include/AVFoundation/AVError.h +++ b/src/frameworks/AVFoundation/include/AVFoundation/AVError.h @@ -1,14 +1,14 @@ #import -const NSErrorDomain AVFoundationErrorDomain; +extern const NSErrorDomain AVFoundationErrorDomain; -NSString *const AVErrorDeviceKey; -NSString *const AVErrorFileSizeKey; -NSString *const AVErrorMediaSubTypeKey; -NSString *const AVErrorMediaTypeKey; -NSString *const AVErrorTimeKey; -NSString *const AVErrorPIDKey; -NSString *const AVErrorRecordingSuccessfullyFinishedKey; -NSString *const AVErrorPresentationTimeStampKey; -NSString *const AVErrorPersistentTrackIDKey; -NSString *const AVErrorFileTypeKey; +extern NSString *const AVErrorDeviceKey; +extern NSString *const AVErrorFileSizeKey; +extern NSString *const AVErrorMediaSubTypeKey; +extern NSString *const AVErrorMediaTypeKey; +extern NSString *const AVErrorTimeKey; +extern NSString *const AVErrorPIDKey; +extern NSString *const AVErrorRecordingSuccessfullyFinishedKey; +extern NSString *const AVErrorPresentationTimeStampKey; +extern NSString *const AVErrorPersistentTrackIDKey; +extern NSString *const AVErrorFileTypeKey; diff --git a/src/frameworks/AVFoundation/include/AVFoundation/AVMediaFormat.h b/src/frameworks/AVFoundation/include/AVFoundation/AVMediaFormat.h index 227c0ef63..8de20cd23 100644 --- a/src/frameworks/AVFoundation/include/AVFoundation/AVMediaFormat.h +++ b/src/frameworks/AVFoundation/include/AVFoundation/AVMediaFormat.h @@ -3,8 +3,8 @@ typedef NSString *AVMediaType; typedef NSString *AVFileType; -const AVMediaType AVMediaTypeAudio; -const AVMediaType AVMediaTypeVideo; +extern const AVMediaType AVMediaTypeAudio; +extern const AVMediaType AVMediaTypeVideo; -const AVFileType AVFileTypeMPEG4; -const AVFileType AVFileTypeQuickTimeMovie; \ No newline at end of file +extern const AVFileType AVFileTypeMPEG4; +extern const AVFileType AVFileTypeQuickTimeMovie; diff --git a/src/frameworks/AVFoundation/include/AVFoundation/AVPlayerItem.h b/src/frameworks/AVFoundation/include/AVFoundation/AVPlayerItem.h index aeb285630..eb9abbb29 100644 --- a/src/frameworks/AVFoundation/include/AVFoundation/AVPlayerItem.h +++ b/src/frameworks/AVFoundation/include/AVFoundation/AVPlayerItem.h @@ -19,7 +19,7 @@ #include -NSString *const AVPlayerItemDidPlayToEndTimeNotification; +extern NSString *const AVPlayerItemDidPlayToEndTimeNotification; @interface AVPlayerItem : NSObject diff --git a/src/frameworks/AVFoundation/include/AVFoundation/AVVideoSettings.h b/src/frameworks/AVFoundation/include/AVFoundation/AVVideoSettings.h index edf420a53..2e9b915f9 100644 --- a/src/frameworks/AVFoundation/include/AVFoundation/AVVideoSettings.h +++ b/src/frameworks/AVFoundation/include/AVFoundation/AVVideoSettings.h @@ -1,12 +1,12 @@ #import -NSString *const AVVideoAverageBitRateKey; -NSString *const AVVideoCodecAppleProRes422; -NSString *const AVVideoCodecAppleProRes4444; -NSString *const AVVideoCodecH264; -NSString *const AVVideoCodecHEVC; -NSString *const AVVideoCodecJPEG; -NSString *const AVVideoCodecKey; -NSString *const AVVideoCompressionPropertiesKey; -NSString *const AVVideoHeightKey; -NSString *const AVVideoWidthKey; +extern NSString *const AVVideoAverageBitRateKey; +extern NSString *const AVVideoCodecAppleProRes422; +extern NSString *const AVVideoCodecAppleProRes4444; +extern NSString *const AVVideoCodecH264; +extern NSString *const AVVideoCodecHEVC; +extern NSString *const AVVideoCodecJPEG; +extern NSString *const AVVideoCodecKey; +extern NSString *const AVVideoCompressionPropertiesKey; +extern NSString *const AVVideoHeightKey; +extern NSString *const AVVideoWidthKey; diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 3581347a8..b7a4201be 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -1,10 +1,5 @@ project(tools) -add_compile_options( - -Werror - -Wall -) - add_darling_executable(sw_vers sw_vers.c) add_darling_executable(sudo sudo.c) add_darling_executable(codesign codesign.c)