Skip to content

Commit 7d67efe

Browse files
committed
Updating for XCode 12
1 parent fd0069d commit 7d67efe

File tree

4 files changed

+41
-177
lines changed

4 files changed

+41
-177
lines changed

src/libprojectM/Common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ inline std::string parseExtension(const std::string & filename) {
213213
const std::size_t start = filename.find_last_of('.');
214214

215215
if (start == std::string::npos || start >= (filename.length()-1))
216-
return {};
216+
return "";
217217
std::string ext = filename.substr(start+1, filename.length());
218218
std::transform(ext.begin(), ext.end(), ext.begin(), tolower);
219219
return ext;

src/libprojectM/libprojectM.xcodeproj/project.pbxproj

Lines changed: 4 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@
684684
161789B8207A675B00D3B0C8 /* Project object */ = {
685685
isa = PBXProject;
686686
attributes = {
687-
LastUpgradeCheck = 1130;
687+
LastUpgradeCheck = 1230;
688688
ORGANIZATIONNAME = MVSTG;
689689
TargetAttributes = {
690690
1612C9A3207A855D00862A3A = {
@@ -891,54 +891,20 @@
891891
161789C2207A675B00D3B0C8 /* Debug */ = {
892892
isa = XCBuildConfiguration;
893893
buildSettings = {
894-
CLANG_ANALYZER_NONNULL = YES;
895-
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
896894
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
897-
CLANG_CXX_LIBRARY = "libc++";
898895
CLANG_ENABLE_MODULES = YES;
899-
CLANG_ENABLE_OBJC_ARC = 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
906-
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
907-
CLANG_WARN_EMPTY_BODY = YES;
908-
CLANG_WARN_ENUM_CONVERSION = YES;
909-
CLANG_WARN_INFINITE_RECURSION = YES;
910-
CLANG_WARN_INT_CONVERSION = YES;
911-
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
912-
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
913-
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
914-
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
915-
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
916-
CLANG_WARN_STRICT_PROTOTYPES = YES;
917-
CLANG_WARN_SUSPICIOUS_MOVE = YES;
918-
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
919-
CLANG_WARN_UNREACHABLE_CODE = YES;
920-
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
921896
CODE_SIGN_IDENTITY = "-";
922897
COPY_PHASE_STRIP = NO;
923898
DEBUG_INFORMATION_FORMAT = dwarf;
924-
ENABLE_STRICT_OBJC_MSGSEND = YES;
925899
ENABLE_TESTABILITY = YES;
926900
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
927-
GCC_C_LANGUAGE_STANDARD = gnu11;
928901
GCC_DYNAMIC_NO_PIC = NO;
929-
GCC_NO_COMMON_BLOCKS = YES;
930902
GCC_OPTIMIZATION_LEVEL = 0;
931903
GCC_PREPROCESSOR_DEFINITIONS = (
932904
"DEBUG=1",
933905
"GL_SILENCE_DEPRECATION=1",
934906
"USE_THREADS=1",
935907
);
936-
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
937-
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
938-
GCC_WARN_UNDECLARED_SELECTOR = YES;
939-
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
940-
GCC_WARN_UNUSED_FUNCTION = YES;
941-
GCC_WARN_UNUSED_VARIABLE = YES;
942908
HEADER_SEARCH_PATHS = (
943909
"$(SRCROOT)/../../mac",
944910
"$(SRCROOT)/../..",
@@ -950,6 +916,7 @@
950916
"$(SRCROOT)/../../vendor",
951917
);
952918
LIBRARY_SEARCH_PATHS = /Library/Frameworks;
919+
MACOSX_DEPLOYMENT_TARGET = 10.9;
953920
MTL_ENABLE_DEBUG_INFO = YES;
954921
ONLY_ACTIVE_ARCH = YES;
955922
OTHER_CFLAGS = (
@@ -962,51 +929,17 @@
962929
161789C3207A675B00D3B0C8 /* Release */ = {
963930
isa = XCBuildConfiguration;
964931
buildSettings = {
965-
CLANG_ANALYZER_NONNULL = YES;
966-
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
967932
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
968-
CLANG_CXX_LIBRARY = "libc++";
969933
CLANG_ENABLE_MODULES = YES;
970-
CLANG_ENABLE_OBJC_ARC = YES;
971-
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
972-
CLANG_WARN_BOOL_CONVERSION = YES;
973-
CLANG_WARN_COMMA = YES;
974-
CLANG_WARN_CONSTANT_CONVERSION = YES;
975-
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
976-
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
977-
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
978-
CLANG_WARN_EMPTY_BODY = YES;
979-
CLANG_WARN_ENUM_CONVERSION = YES;
980-
CLANG_WARN_INFINITE_RECURSION = YES;
981-
CLANG_WARN_INT_CONVERSION = YES;
982-
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
983-
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
984-
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
985-
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
986-
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
987-
CLANG_WARN_STRICT_PROTOTYPES = YES;
988-
CLANG_WARN_SUSPICIOUS_MOVE = YES;
989-
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
990-
CLANG_WARN_UNREACHABLE_CODE = YES;
991-
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
992934
CODE_SIGN_IDENTITY = "-";
993935
COPY_PHASE_STRIP = NO;
994936
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
995-
ENABLE_NS_ASSERTIONS = NO;
996-
ENABLE_STRICT_OBJC_MSGSEND = YES;
997937
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
998-
GCC_C_LANGUAGE_STANDARD = gnu11;
999-
GCC_NO_COMMON_BLOCKS = YES;
938+
GCC_OPTIMIZATION_LEVEL = fast;
1000939
GCC_PREPROCESSOR_DEFINITIONS = (
1001940
"USE_THREADS=1",
1002941
"GL_SILENCE_DEPRECATION=1",
1003942
);
1004-
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1005-
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
1006-
GCC_WARN_UNDECLARED_SELECTOR = YES;
1007-
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
1008-
GCC_WARN_UNUSED_FUNCTION = YES;
1009-
GCC_WARN_UNUSED_VARIABLE = YES;
1010943
HEADER_SEARCH_PATHS = (
1011944
"$(SRCROOT)/../../mac",
1012945
"$(SRCROOT)/../..",
@@ -1018,6 +951,7 @@
1018951
"$(SRCROOT)/../../vendor",
1019952
);
1020953
LIBRARY_SEARCH_PATHS = /Library/Frameworks;
954+
MACOSX_DEPLOYMENT_TARGET = 10.9;
1021955
MTL_ENABLE_DEBUG_INFO = NO;
1022956
OTHER_CFLAGS = (
1023957
"-fno-stack-check",

src/projectM-sdl/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
projectMSDL
1+
projectMSDL
2+
projectM SDL.pkg

0 commit comments

Comments
 (0)