diff --git a/PanoPainter.xcodeproj/project.pbxproj b/PanoPainter.xcodeproj/project.pbxproj index 551c0fd..da1a77d 100644 --- a/PanoPainter.xcodeproj/project.pbxproj +++ b/PanoPainter.xcodeproj/project.pbxproj @@ -181,6 +181,10 @@ ADA6C9FA236AFC6F00116746 /* libmp4v2.2.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = ADA6C9F8236AFC5700116746 /* libmp4v2.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; ADA6C9FC236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA6C9FB236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib */; }; ADA6C9FD236AFCC200116746 /* libopenh264-2.0.0-osx64.5.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = ADA6C9FB236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + ADA6C9FF236B06A100116746 /* libyuv-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA6C9FE236B06A100116746 /* libyuv-ios.a */; }; + ADA6CA01236B06AE00116746 /* libyuv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA6CA00236B06AE00116746 /* libyuv.a */; }; + ADA6CA03236BAF1B00116746 /* mp4enc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA6CA02236BAF1A00116746 /* mp4enc.cpp */; }; + ADA6CA04236BAF1B00116746 /* mp4enc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA6CA02236BAF1A00116746 /* mp4enc.cpp */; }; ADAECC932367922B00709FCC /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADAECC912367922B00709FCC /* event.cpp */; }; ADAECC942367922B00709FCC /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADAECC912367922B00709FCC /* event.cpp */; }; ADAECC952367922B00709FCC /* experiments.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADAECC922367922B00709FCC /* experiments.cpp */; }; @@ -517,6 +521,10 @@ ADA3ABF5222C8C370083B825 /* node_panel_quick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_panel_quick.h; sourceTree = ""; }; ADA6C9F8236AFC5700116746 /* libmp4v2.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmp4v2.2.dylib; path = libs/mp4v2/lib/osx/libmp4v2.2.dylib; sourceTree = ""; }; ADA6C9FB236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopenh264-2.0.0-osx64.5.dylib"; path = "libs/openh264/lib/libopenh264-2.0.0-osx64.5.dylib"; sourceTree = ""; }; + ADA6C9FE236B06A100116746 /* libyuv-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libyuv-ios.a"; path = "libs/libyuv/lib/ios/libyuv-ios.a"; sourceTree = ""; }; + ADA6CA00236B06AE00116746 /* libyuv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libyuv.a; path = libs/libyuv/lib/osx/libyuv.a; sourceTree = ""; }; + ADA6CA02236BAF1A00116746 /* mp4enc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mp4enc.cpp; sourceTree = ""; }; + ADA6CA05236BAF2C00116746 /* mp4enc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mp4enc.h; sourceTree = ""; }; 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; }; @@ -622,6 +630,7 @@ AD0E5CB01ECC726400C35669 /* Cocoa.framework in Frameworks */, AD0E5CAF1ECC726000C35669 /* CoreFoundation.framework in Frameworks */, ADF396DD216F749200024722 /* AppKit.framework in Frameworks */, + ADA6CA01236B06AE00116746 /* libyuv.a in Frameworks */, AD0E5CAE1ECC725400C35669 /* CoreVideo.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -671,6 +680,7 @@ ADD7D2B11EBFA42600D5A897 /* libz.tbd in Frameworks */, AD759B681F2796EA00211963 /* OpenGLES.framework in Frameworks */, ADD7D28D1EBF9D6F00D5A897 /* CoreFoundation.framework in Frameworks */, + ADA6C9FF236B06A100116746 /* libyuv-ios.a in Frameworks */, ADD7D28B1EBF9D5D00D5A897 /* UIKit.framework in Frameworks */, ADD7D2871EBF9C6700D5A897 /* Foundation.framework in Frameworks */, ADD7D2AF1EBFA35F00D5A897 /* libcurl.a in Frameworks */, @@ -690,6 +700,7 @@ AD06989520CC6C210010825F /* iOS */ = { isa = PBXGroup; children = ( + ADA6C9FE236B06A100116746 /* libyuv-ios.a */, ADAECCB32367E61500709FCC /* libmp4v2-arm64.a */, ADAECCB22367E61500709FCC /* libmp4v2-armv7.a */, ADAECCA82367DE0900709FCC /* libopenh264-2.0.0-ios.a */, @@ -713,6 +724,7 @@ AD06989820CC6C3E0010825F /* OSX */ = { isa = PBXGroup; children = ( + ADA6CA00236B06AE00116746 /* libyuv.a */, ADA6C9F8236AFC5700116746 /* libmp4v2.2.dylib */, ADA6C9FB236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib */, AD46901C22FF4328003DA1A6 /* AppCenter.framework */, @@ -949,6 +961,8 @@ ADB1C3DB1EA531B0009A65BD /* keymap.h */, AD8CF71F1E913F0500083FFD /* log.cpp */, AD8CF7201E913F0500083FFD /* log.h */, + ADA6CA02236BAF1A00116746 /* mp4enc.cpp */, + ADA6CA05236BAF2C00116746 /* mp4enc.h */, AD95AEC51E41EDEC002DD03A /* pch.cpp */, AD58E06C1E2A78BD006ACC15 /* pch.h */, AD4C08D71E89BD0F0051D85F /* rtt.cpp */, @@ -1581,6 +1595,7 @@ AD0E5CD01ECC72AD00C35669 /* action.cpp in Sources */, AD0E5CC01ECC72AD00C35669 /* node_icon.cpp in Sources */, AD0E5CC11ECC72AD00C35669 /* node_image_texture.cpp in Sources */, + ADA6CA04236BAF1B00116746 /* mp4enc.cpp in Sources */, ADF4F7762263920400422C7C /* settings.cpp in Sources */, AD83A0DA232A793A005B0871 /* node_input_box.cpp in Sources */, AD0E5CBD1ECC72AD00C35669 /* node_checkbox.cpp in Sources */, @@ -1711,6 +1726,7 @@ AD02F0C31EDC457C00B2E692 /* sequencer.cpp in Sources */, AD1063A51EC7AE92002A525F /* node_panel_stroke.cpp in Sources */, ADD7D2911EBF9E1C00D5A897 /* event.cpp in Sources */, + ADA6CA03236BAF1B00116746 /* mp4enc.cpp in Sources */, ADC6F4671F3E66FB004177FA /* app_dialogs.cpp in Sources */, ADAECC932367922B00709FCC /* event.cpp in Sources */, AD1063AB1EC7AE92002A525F /* node_text.cpp in Sources */, @@ -1803,6 +1819,7 @@ "$(inherited)", "$(PROJECT_DIR)/libs/mp4v2/lib/osx", "$(PROJECT_DIR)/libs/openh264/lib", + "$(PROJECT_DIR)/libs/libyuv/lib/osx", ); MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CPLUSPLUSFLAGS = ( @@ -1839,6 +1856,7 @@ "$(inherited)", "$(PROJECT_DIR)/libs/mp4v2/lib/osx", "$(PROJECT_DIR)/libs/openh264/lib", + "$(PROJECT_DIR)/libs/libyuv/lib/osx", ); MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_CPLUSPLUSFLAGS = ( @@ -1913,6 +1931,7 @@ libs/fmt/include, libs/openh264/include, libs/mp4v2/include, + libs/libyuv/include, ); LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -1977,6 +1996,7 @@ libs/fmt/include, libs/openh264/include, libs/mp4v2/include, + libs/libyuv/include, ); LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -2186,6 +2206,7 @@ "$(PROJECT_DIR)/libs/openh264/lib", "$(PROJECT_DIR)/libs/mp4v2/lib/ios/arm64", "$(PROJECT_DIR)/libs/mp4v2/lib/ios/armv7", + "$(PROJECT_DIR)/libs/libyuv/lib/ios", ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -2229,6 +2250,7 @@ "$(PROJECT_DIR)/libs/openh264/lib", "$(PROJECT_DIR)/libs/mp4v2/lib/ios/arm64", "$(PROJECT_DIR)/libs/mp4v2/lib/ios/armv7", + "$(PROJECT_DIR)/libs/libyuv/lib/ios", ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", diff --git a/libs/libyuv b/libs/libyuv index 55ba1ae..5cb437d 160000 --- a/libs/libyuv +++ b/libs/libyuv @@ -1 +1 @@ -Subproject commit 55ba1ae9b4f556412638f957b2c1700f12256e29 +Subproject commit 5cb437dad0dd353bab0e1324f6c816c25a2b7c0a