From 9f6524cf28dd33966fdd505b5c458115935bc3f4 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Wed, 30 Oct 2019 00:06:56 +0100 Subject: [PATCH] update Xcode project --- PanoPainter.xcodeproj/project.pbxproj | 24 ++++++++++++++++++++++++ libs/mp4v2 | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/PanoPainter.xcodeproj/project.pbxproj b/PanoPainter.xcodeproj/project.pbxproj index ff017f2..b9b9cef 100644 --- a/PanoPainter.xcodeproj/project.pbxproj +++ b/PanoPainter.xcodeproj/project.pbxproj @@ -181,6 +181,9 @@ ADAECC942367922B00709FCC /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADAECC912367922B00709FCC /* event.cpp */; }; ADAECC952367922B00709FCC /* experiments.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADAECC922367922B00709FCC /* experiments.cpp */; }; ADAECC962367922B00709FCC /* experiments.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADAECC922367922B00709FCC /* experiments.cpp */; }; + ADAECCA92367DE0900709FCC /* libopenh264-2.0.0-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADAECCA82367DE0900709FCC /* libopenh264-2.0.0-ios.a */; }; + ADAECCB42367E61500709FCC /* libmp4v2-armv7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADAECCB22367E61500709FCC /* libmp4v2-armv7.a */; }; + ADAECCB52367E61500709FCC /* libmp4v2-arm64.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADAECCB32367E61500709FCC /* libmp4v2-arm64.a */; }; ADBC8C4E1FAE7D360094B339 /* node_dialog_browse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C471FAE7CC20094B339 /* node_dialog_browse.cpp */; }; ADBC8C4F1FAE7D370094B339 /* node_dialog_browse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C471FAE7CC20094B339 /* node_dialog_browse.cpp */; }; ADBC8C551FAFD0520094B339 /* app_cloud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC8C511FAFD0360094B339 /* app_cloud.cpp */; }; @@ -499,6 +502,9 @@ ADAE4B2F216D075400B1DD8C /* HockeySDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = HockeySDKResources.bundle; path = "libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDKResources.bundle"; sourceTree = ""; }; ADAECC912367922B00709FCC /* event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = libs/yoga/yoga/event/event.cpp; sourceTree = SOURCE_ROOT; }; ADAECC922367922B00709FCC /* experiments.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = experiments.cpp; path = libs/yoga/yoga/internal/experiments.cpp; sourceTree = SOURCE_ROOT; }; + ADAECCA82367DE0900709FCC /* libopenh264-2.0.0-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libopenh264-2.0.0-ios.a"; path = "libs/openh264/lib/libopenh264-2.0.0-ios.a"; sourceTree = ""; }; + ADAECCB22367E61500709FCC /* libmp4v2-armv7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libmp4v2-armv7.a"; path = "libs/mp4v2/lib/ios/libmp4v2-armv7.a"; sourceTree = ""; }; + ADAECCB32367E61500709FCC /* libmp4v2-arm64.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libmp4v2-arm64.a"; path = "libs/mp4v2/lib/ios/libmp4v2-arm64.a"; sourceTree = ""; }; ADB1C3D81EA3A156009A65BD /* event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = event.cpp; sourceTree = ""; }; ADB1C3D91EA3A156009A65BD /* event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = event.h; sourceTree = ""; }; ADB1C3DB1EA531B0009A65BD /* keymap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keymap.h; sourceTree = ""; }; @@ -621,16 +627,19 @@ files = ( AD83A0D323268B6F005B0871 /* MobileCoreServices.framework in Frameworks */, ADC8F77F216678270084ECAD /* CoreTelephony.framework in Frameworks */, + ADAECCA92367DE0900709FCC /* libopenh264-2.0.0-ios.a in Frameworks */, ADC8F780216678270084ECAD /* CoreText.framework in Frameworks */, ADC8F781216678270084ECAD /* QuartzCore.framework in Frameworks */, ADC8F782216678270084ECAD /* QuickLook.framework in Frameworks */, AD46901922FF431A003DA1A6 /* AppCenterAnalytics.framework in Frameworks */, ADC8F783216678270084ECAD /* MobileCoreServices.framework in Frameworks */, ADC8F784216678270084ECAD /* SystemConfiguration.framework in Frameworks */, + ADAECCB52367E61500709FCC /* libmp4v2-arm64.a in Frameworks */, ADE0863321239D0700945972 /* Accelerate.framework in Frameworks */, ADE0863121239CDA00945972 /* MediaPlayer.framework in Frameworks */, ADE0862F21239C9200945972 /* AudioToolbox.framework in Frameworks */, AD3087C82061D1CD009F9260 /* CoreGraphics.framework in Frameworks */, + ADAECCB42367E61500709FCC /* libmp4v2-armv7.a in Frameworks */, AD3087C62061D1B4009F9260 /* CoreVideo.framework in Frameworks */, AD3087C2205F016F009F9260 /* AVFoundation.framework in Frameworks */, AD46901722FF4319003DA1A6 /* AppCenter.framework in Frameworks */, @@ -661,6 +670,9 @@ AD06989520CC6C210010825F /* iOS */ = { isa = PBXGroup; children = ( + ADAECCB32367E61500709FCC /* libmp4v2-arm64.a */, + ADAECCB22367E61500709FCC /* libmp4v2-armv7.a */, + ADAECCA82367DE0900709FCC /* libopenh264-2.0.0-ios.a */, AD46901422FF4319003DA1A6 /* AppCenter.framework */, AD46901622FF4319003DA1A6 /* AppCenterAnalytics.framework */, AD46901522FF4319003DA1A6 /* AppCenterCrashes.framework */, @@ -1866,6 +1878,8 @@ libs/sqlite3, libs/nanort, libs/fmt/include, + libs/openh264/include, + libs/mp4v2/include, ); LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -1928,6 +1942,8 @@ libs/sqlite3, libs/nanort, libs/fmt/include, + libs/openh264/include, + libs/mp4v2/include, ); LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -2133,6 +2149,10 @@ LIBRARY_SEARCH_PATHS = ( "libs/curl-android-ios/iOS", libs/libSonarPen, + "$(PROJECT_DIR)/libs/mp4v2/lib/ios", + "$(PROJECT_DIR)/libs/openh264/lib", + "$(PROJECT_DIR)/libs/mp4v2/lib/ios/arm64", + "$(PROJECT_DIR)/libs/mp4v2/lib/ios/armv7", ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -2172,6 +2192,10 @@ LIBRARY_SEARCH_PATHS = ( "libs/curl-android-ios/iOS", libs/libSonarPen, + "$(PROJECT_DIR)/libs/mp4v2/lib/ios", + "$(PROJECT_DIR)/libs/openh264/lib", + "$(PROJECT_DIR)/libs/mp4v2/lib/ios/arm64", + "$(PROJECT_DIR)/libs/mp4v2/lib/ios/armv7", ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", diff --git a/libs/mp4v2 b/libs/mp4v2 index 0a3ca3a..b6460b6 160000 --- a/libs/mp4v2 +++ b/libs/mp4v2 @@ -1 +1 @@ -Subproject commit 0a3ca3acc21b9f7396d677b4bae97abfdf20c8ff +Subproject commit b6460b644ea7237ea0840859b22f818698832b48