Skip to content

Commit 202741f

Browse files
revmischarevmischa
committed
Add macOS entitlements for audio capture. Upgrade to recommended settings.
1 parent 3b43901 commit 202741f

File tree

5 files changed

+155
-21
lines changed

5 files changed

+155
-21
lines changed

‎src/libprojectM/MilkdropPresetFactory/Expr.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ class IfExpr : public PrefunExpr
262262
public:
263263
IfExpr(Func *fun, Expr **expr_list_) : PrefunExpr(fun,expr_list_) {}
264264

265-
float eval ( int mesh_i, int mesh_j )
265+
float eval ( int mesh_i, int mesh_j ) override
266266
{
267267
// see if_wrapper()
268268
float val = expr_list[0]->eval ( mesh_i, mesh_j );

‎src/libprojectM/libprojectM.xcodeproj/project.pbxproj‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@
684684
161789B8207A675B00D3B0C8 /* Project object */ = {
685685
isa = PBXProject;
686686
attributes = {
687-
LastUpgradeCheck = 1230;
687+
LastUpgradeCheck = 1240;
688688
ORGANIZATIONNAME = MVSTG;
689689
TargetAttributes = {
690690
1612C9A3207A855D00862A3A = {
@@ -842,6 +842,7 @@
842842
isa = XCBuildConfiguration;
843843
buildSettings = {
844844
ALWAYS_SEARCH_USER_PATHS = NO;
845+
CLANG_ENABLE_OBJC_WEAK = YES;
845846
CODE_SIGN_STYLE = Automatic;
846847
EXECUTABLE_PREFIX = lib;
847848
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
@@ -855,6 +856,7 @@
855856
isa = XCBuildConfiguration;
856857
buildSettings = {
857858
ALWAYS_SEARCH_USER_PATHS = NO;
859+
CLANG_ENABLE_OBJC_WEAK = YES;
858860
CODE_SIGN_STYLE = Automatic;
859861
EXECUTABLE_PREFIX = lib;
860862
MACOSX_DEPLOYMENT_TARGET = 10.13;
@@ -867,6 +869,7 @@
867869
isa = XCBuildConfiguration;
868870
buildSettings = {
869871
ALWAYS_SEARCH_USER_PATHS = NO;
872+
CLANG_ENABLE_OBJC_WEAK = YES;
870873
CODE_SIGN_STYLE = Automatic;
871874
EXECUTABLE_PREFIX = lib;
872875
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
@@ -880,6 +883,7 @@
880883
isa = XCBuildConfiguration;
881884
buildSettings = {
882885
ALWAYS_SEARCH_USER_PATHS = NO;
886+
CLANG_ENABLE_OBJC_WEAK = YES;
883887
CODE_SIGN_STYLE = Automatic;
884888
EXECUTABLE_PREFIX = lib;
885889
MACOSX_DEPLOYMENT_TARGET = 10.13;
@@ -893,18 +897,44 @@
893897
buildSettings = {
894898
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
895899
CLANG_ENABLE_MODULES = YES;
900+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
901+
CLANG_WARN_BOOL_CONVERSION = YES;
902+
CLANG_WARN_COMMA = YES;
903+
CLANG_WARN_CONSTANT_CONVERSION = YES;
904+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
905+
CLANG_WARN_EMPTY_BODY = YES;
906+
CLANG_WARN_ENUM_CONVERSION = YES;
907+
CLANG_WARN_INFINITE_RECURSION = YES;
908+
CLANG_WARN_INT_CONVERSION = YES;
909+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
910+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
911+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
912+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
913+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
914+
CLANG_WARN_STRICT_PROTOTYPES = YES;
915+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
916+
CLANG_WARN_UNREACHABLE_CODE = YES;
917+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
896918
CODE_SIGN_IDENTITY = "-";
897919
COPY_PHASE_STRIP = NO;
898920
DEBUG_INFORMATION_FORMAT = dwarf;
921+
ENABLE_STRICT_OBJC_MSGSEND = YES;
899922
ENABLE_TESTABILITY = YES;
900923
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
901924
GCC_DYNAMIC_NO_PIC = NO;
925+
GCC_NO_COMMON_BLOCKS = YES;
902926
GCC_OPTIMIZATION_LEVEL = 0;
903927
GCC_PREPROCESSOR_DEFINITIONS = (
904928
"DEBUG=1",
905929
"GL_SILENCE_DEPRECATION=1",
906930
"USE_THREADS=1",
907931
);
932+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
933+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
934+
GCC_WARN_UNDECLARED_SELECTOR = YES;
935+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
936+
GCC_WARN_UNUSED_FUNCTION = YES;
937+
GCC_WARN_UNUSED_VARIABLE = YES;
908938
HEADER_SEARCH_PATHS = (
909939
"$(SRCROOT)/../../mac",
910940
"$(SRCROOT)/../..",
@@ -931,15 +961,41 @@
931961
buildSettings = {
932962
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
933963
CLANG_ENABLE_MODULES = YES;
964+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
965+
CLANG_WARN_BOOL_CONVERSION = YES;
966+
CLANG_WARN_COMMA = YES;
967+
CLANG_WARN_CONSTANT_CONVERSION = YES;
968+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
969+
CLANG_WARN_EMPTY_BODY = YES;
970+
CLANG_WARN_ENUM_CONVERSION = YES;
971+
CLANG_WARN_INFINITE_RECURSION = YES;
972+
CLANG_WARN_INT_CONVERSION = YES;
973+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
974+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
975+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
976+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
977+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
978+
CLANG_WARN_STRICT_PROTOTYPES = YES;
979+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
980+
CLANG_WARN_UNREACHABLE_CODE = YES;
981+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
934982
CODE_SIGN_IDENTITY = "-";
935983
COPY_PHASE_STRIP = NO;
936984
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
985+
ENABLE_STRICT_OBJC_MSGSEND = YES;
937986
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
987+
GCC_NO_COMMON_BLOCKS = YES;
938988
GCC_OPTIMIZATION_LEVEL = fast;
939989
GCC_PREPROCESSOR_DEFINITIONS = (
940990
"USE_THREADS=1",
941991
"GL_SILENCE_DEPRECATION=1",
942992
);
993+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
994+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
995+
GCC_WARN_UNDECLARED_SELECTOR = YES;
996+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
997+
GCC_WARN_UNUSED_FUNCTION = YES;
998+
GCC_WARN_UNUSED_VARIABLE = YES;
943999
HEADER_SEARCH_PATHS = (
9441000
"$(SRCROOT)/../../mac",
9451001
"$(SRCROOT)/../..",
@@ -963,6 +1019,7 @@
9631019
16178B14207A6F4000D3B0C8 /* Debug */ = {
9641020
isa = XCBuildConfiguration;
9651021
buildSettings = {
1022+
CLANG_ENABLE_OBJC_WEAK = YES;
9661023
CODE_SIGN_STYLE = Automatic;
9671024
EXECUTABLE_PREFIX = lib;
9681025
FRAMEWORK_SEARCH_PATHS = (
@@ -981,6 +1038,7 @@
9811038
16178B15207A6F4000D3B0C8 /* Release */ = {
9821039
isa = XCBuildConfiguration;
9831040
buildSettings = {
1041+
CLANG_ENABLE_OBJC_WEAK = YES;
9841042
CODE_SIGN_STYLE = Automatic;
9851043
EXECUTABLE_PREFIX = lib;
9861044
FRAMEWORK_SEARCH_PATHS = (
@@ -999,6 +1057,7 @@
9991057
16A49E59207A7C8C00E508EA /* Debug */ = {
10001058
isa = XCBuildConfiguration;
10011059
buildSettings = {
1060+
CLANG_ENABLE_OBJC_WEAK = YES;
10021061
CODE_SIGN_STYLE = Automatic;
10031062
EXECUTABLE_PREFIX = lib;
10041063
FRAMEWORK_SEARCH_PATHS = (
@@ -1017,6 +1076,7 @@
10171076
16A49E5A207A7C8C00E508EA /* Release */ = {
10181077
isa = XCBuildConfiguration;
10191078
buildSettings = {
1079+
CLANG_ENABLE_OBJC_WEAK = YES;
10201080
CODE_SIGN_STYLE = Automatic;
10211081
EXECUTABLE_PREFIX = lib;
10221082
FRAMEWORK_SEARCH_PATHS = (

‎src/projectM-iTunes/iTunes Plugin.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
C3F9D7A717B82CC3009E58CB /* Project object */ = {
371371
isa = PBXProject;
372372
attributes = {
373-
LastUpgradeCheck = 0920;
373+
LastUpgradeCheck = 1240;
374374
ORGANIZATIONNAME = projectM;
375375
TargetAttributes = {
376376
C37EBD2A19A0112900220265 = {
@@ -385,10 +385,9 @@
385385
};
386386
buildConfigurationList = C3F9D7AA17B82CC3009E58CB /* Build configuration list for PBXProject "iTunes Plugin" */;
387387
compatibilityVersion = "Xcode 3.2";
388-
developmentRegion = English;
388+
developmentRegion = en;
389389
hasScannedForEncodings = 0;
390390
knownRegions = (
391-
English,
392391
en,
393392
Base,
394393
);
@@ -552,7 +551,7 @@
552551
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
553552
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
554553
CODE_SIGN_ENTITLEMENTS = "projectM Visualizer/projectM Visualizer.entitlements";
555-
CODE_SIGN_IDENTITY = "";
554+
CODE_SIGN_IDENTITY = "-";
556555
COMBINE_HIDPI_IMAGES = YES;
557556
FRAMEWORK_SEARCH_PATHS = (
558557
"$(inherited)",
@@ -602,7 +601,7 @@
602601
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
603602
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
604603
CODE_SIGN_ENTITLEMENTS = "projectM Visualizer/projectM Visualizer.entitlements";
605-
CODE_SIGN_IDENTITY = "";
604+
CODE_SIGN_IDENTITY = "-";
606605
COMBINE_HIDPI_IMAGES = YES;
607606
ENABLE_NS_ASSERTIONS = NO;
608607
FRAMEWORK_SEARCH_PATHS = (
@@ -640,20 +639,22 @@
640639
isa = XCBuildConfiguration;
641640
buildSettings = {
642641
ALWAYS_SEARCH_USER_PATHS = NO;
643-
ARCHS = x86_64;
644642
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
645643
CLANG_CXX_LIBRARY = "libc++";
646644
CLANG_ENABLE_MODULES = NO;
647645
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
648646
CLANG_WARN_BOOL_CONVERSION = YES;
649647
CLANG_WARN_COMMA = YES;
650648
CLANG_WARN_CONSTANT_CONVERSION = YES;
649+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
651650
CLANG_WARN_EMPTY_BODY = YES;
652651
CLANG_WARN_ENUM_CONVERSION = YES;
653652
CLANG_WARN_INFINITE_RECURSION = YES;
654653
CLANG_WARN_INT_CONVERSION = YES;
655654
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
655+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
656656
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
657+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
657658
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
658659
CLANG_WARN_STRICT_PROTOTYPES = YES;
659660
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -698,20 +699,22 @@
698699
isa = XCBuildConfiguration;
699700
buildSettings = {
700701
ALWAYS_SEARCH_USER_PATHS = NO;
701-
ARCHS = x86_64;
702702
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
703703
CLANG_CXX_LIBRARY = "libc++";
704704
CLANG_ENABLE_MODULES = NO;
705705
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
706706
CLANG_WARN_BOOL_CONVERSION = YES;
707707
CLANG_WARN_COMMA = YES;
708708
CLANG_WARN_CONSTANT_CONVERSION = YES;
709+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
709710
CLANG_WARN_EMPTY_BODY = YES;
710711
CLANG_WARN_ENUM_CONVERSION = YES;
711712
CLANG_WARN_INFINITE_RECURSION = YES;
712713
CLANG_WARN_INT_CONVERSION = YES;
713714
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
715+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
714716
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
717+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
715718
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
716719
CLANG_WARN_STRICT_PROTOTYPES = YES;
717720
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -749,6 +752,7 @@
749752
C3F9D7C217B82CC3009E58CB /* Debug */ = {
750753
isa = XCBuildConfiguration;
751754
buildSettings = {
755+
CLANG_ENABLE_OBJC_WEAK = YES;
752756
COMBINE_HIDPI_IMAGES = YES;
753757
FRAMEWORK_SEARCH_PATHS = (
754758
"$(inherited)",
@@ -787,6 +791,7 @@
787791
C3F9D7C317B82CC3009E58CB /* Release */ = {
788792
isa = XCBuildConfiguration;
789793
buildSettings = {
794+
CLANG_ENABLE_OBJC_WEAK = YES;
790795
COMBINE_HIDPI_IMAGES = YES;
791796
FRAMEWORK_SEARCH_PATHS = (
792797
"$(inherited)",

‎src/projectM-sdl/SDLprojectM.entitlements‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.cs.allow-jit</key>
6+
<true/>
7+
<key>com.apple.security.cs.disable-library-validation</key>
8+
<true/>
9+
<key>com.apple.security.device.audio-input</key>
10+
<true/>
11+
<key>com.apple.security.device.microphone</key>
12+
<true/>
13+
</dict>
14+
</plist>

0 commit comments

Comments
 (0)