diff --git a/.gitmodules b/.gitmodules index 6d2a66e..7ed0192 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "libs/curl-win"] path = libs/curl-win url = https://omigamedev@bitbucket.org/omigamedev/curl-win64.git +[submodule "libs/hockeyapp"] + path = libs/hockeyapp + url = https://bitbucket.org/omigamedev/hockeyapp.git diff --git a/PanoPainter-OSX/main.cpp b/PanoPainter-OSX/main.cpp index 5796221..31505df 100644 --- a/PanoPainter-OSX/main.cpp +++ b/PanoPainter-OSX/main.cpp @@ -12,6 +12,7 @@ #include #include #import "objc_utils.h" +#import #include #include @@ -425,7 +426,11 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTime } - (void)applicationDidFinishLaunching:(NSNotification *)notification { - [[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"NSApplicationCrashOnExceptions": @YES }]; + //[[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"NSApplicationCrashOnExceptions": @YES }]; + + [[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"74cc797acaf74b6a9cde7fa4d59585c0"]; + // Do some additional configuration if needed here + [[BITHockeyManager sharedHockeyManager] startManager]; if (!App::I.check_license()) return; diff --git a/PanoPainter.xcodeproj/project.pbxproj b/PanoPainter.xcodeproj/project.pbxproj index f55ddab..d6dd16a 100644 --- a/PanoPainter.xcodeproj/project.pbxproj +++ b/PanoPainter.xcodeproj/project.pbxproj @@ -135,6 +135,17 @@ ADC6F4631F3AFF2D004177FA /* node_dialog_layer_rename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4611F3AFA2B004177FA /* node_dialog_layer_rename.cpp */; }; ADC6F4671F3E66FB004177FA /* app_dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */; }; ADC6F4681F3E66FB004177FA /* app_dialogs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */; }; + ADC8F776216675A90084ECAD /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F775216675A80084ECAD /* HockeySDK.framework */; }; + ADC8F777216675B70084ECAD /* HockeySDK.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = ADC8F775216675A80084ECAD /* HockeySDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + ADC8F77F216678270084ECAD /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F779216678260084ECAD /* CoreTelephony.framework */; }; + ADC8F780216678270084ECAD /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F77A216678260084ECAD /* CoreText.framework */; }; + ADC8F781216678270084ECAD /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F77B216678260084ECAD /* QuartzCore.framework */; }; + ADC8F782216678270084ECAD /* QuickLook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F77C216678260084ECAD /* QuickLook.framework */; }; + ADC8F783216678270084ECAD /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F77D216678270084ECAD /* MobileCoreServices.framework */; }; + ADC8F784216678270084ECAD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F77E216678270084ECAD /* SystemConfiguration.framework */; }; + ADC8F786216678660084ECAD /* HockeySDK.embeddedframework in Resources */ = {isa = PBXBuildFile; fileRef = ADC8F785216678660084ECAD /* HockeySDK.embeddedframework */; }; + ADC8F787216679B00084ECAD /* HockeySDK.embeddedframework in CopyFiles */ = {isa = PBXBuildFile; fileRef = ADC8F785216678660084ECAD /* HockeySDK.embeddedframework */; }; + ADC8F78921667C740084ECAD /* HockeySDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADC8F78821667C740084ECAD /* HockeySDK.framework */; }; ADD6AFD71F94DEB000E92461 /* node_progress_bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD6AFD61F94DEAF00E92461 /* node_progress_bar.cpp */; }; ADD6AFD81F94DEB000E92461 /* node_progress_bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD6AFD61F94DEAF00E92461 /* node_progress_bar.cpp */; }; ADD7D26F1EBF9AE300D5A897 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADD7D26E1EBF9AE300D5A897 /* main.cpp */; }; @@ -214,6 +225,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + ADC8F787216679B00084ECAD /* HockeySDK.embeddedframework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -223,6 +235,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + ADC8F777216675B70084ECAD /* HockeySDK.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -394,6 +407,15 @@ ADC6F4601F3AFA2A004177FA /* node_dialog_layer_rename.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = node_dialog_layer_rename.h; sourceTree = ""; }; ADC6F4611F3AFA2B004177FA /* node_dialog_layer_rename.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = node_dialog_layer_rename.cpp; sourceTree = ""; }; ADC6F4651F3E66FA004177FA /* app_dialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = app_dialogs.cpp; sourceTree = ""; }; + ADC8F775216675A80084ECAD /* HockeySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HockeySDK.framework; path = "libs/hockeyapp/HockeySDK-Mac/HockeySDK.framework"; sourceTree = ""; }; + ADC8F779216678260084ECAD /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/CoreTelephony.framework; sourceTree = DEVELOPER_DIR; }; + ADC8F77A216678260084ECAD /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/CoreText.framework; sourceTree = DEVELOPER_DIR; }; + ADC8F77B216678260084ECAD /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; }; + ADC8F77C216678260084ECAD /* QuickLook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickLook.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/QuickLook.framework; sourceTree = DEVELOPER_DIR; }; + ADC8F77D216678270084ECAD /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; }; + ADC8F77E216678270084ECAD /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.4.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; + ADC8F785216678660084ECAD /* HockeySDK.embeddedframework */ = {isa = PBXFileReference; lastKnownFileType = folder; name = HockeySDK.embeddedframework; path = "libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework"; sourceTree = ""; }; + ADC8F78821667C740084ECAD /* HockeySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HockeySDK.framework; path = "libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDK.framework"; sourceTree = ""; }; ADD6AFD51F94DEAF00E92461 /* node_progress_bar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = node_progress_bar.h; sourceTree = ""; }; ADD6AFD61F94DEAF00E92461 /* node_progress_bar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = node_progress_bar.cpp; sourceTree = ""; }; ADD7D26B1EBF9AE300D5A897 /* PanoPainter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PanoPainter.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -441,6 +463,7 @@ AD0E5CB01ECC726400C35669 /* Cocoa.framework in Frameworks */, AD0E5CAF1ECC726000C35669 /* CoreFoundation.framework in Frameworks */, AD0E5CAE1ECC725400C35669 /* CoreVideo.framework in Frameworks */, + ADC8F776216675A90084ECAD /* HockeySDK.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -463,6 +486,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + ADC8F77F216678270084ECAD /* CoreTelephony.framework in Frameworks */, + ADC8F780216678270084ECAD /* CoreText.framework in Frameworks */, + ADC8F781216678270084ECAD /* QuartzCore.framework in Frameworks */, + ADC8F782216678270084ECAD /* QuickLook.framework in Frameworks */, + ADC8F783216678270084ECAD /* MobileCoreServices.framework in Frameworks */, + ADC8F784216678270084ECAD /* SystemConfiguration.framework in Frameworks */, ADE0863321239D0700945972 /* Accelerate.framework in Frameworks */, ADE0863121239CDA00945972 /* MediaPlayer.framework in Frameworks */, ADE0862F21239C9200945972 /* AudioToolbox.framework in Frameworks */, @@ -477,6 +506,7 @@ AD759B681F2796EA00211963 /* OpenGLES.framework in Frameworks */, ADD7D28D1EBF9D6F00D5A897 /* CoreFoundation.framework in Frameworks */, ADD7D28B1EBF9D5D00D5A897 /* UIKit.framework in Frameworks */, + ADC8F78921667C740084ECAD /* HockeySDK.framework in Frameworks */, ADD7D2871EBF9C6700D5A897 /* Foundation.framework in Frameworks */, ADD7D2AF1EBFA35F00D5A897 /* libcurl.a in Frameworks */, ); @@ -488,6 +518,13 @@ AD06989520CC6C210010825F /* iOS */ = { isa = PBXGroup; children = ( + ADC8F785216678660084ECAD /* HockeySDK.embeddedframework */, + ADC8F779216678260084ECAD /* CoreTelephony.framework */, + ADC8F77A216678260084ECAD /* CoreText.framework */, + ADC8F77D216678270084ECAD /* MobileCoreServices.framework */, + ADC8F77B216678260084ECAD /* QuartzCore.framework */, + ADC8F77C216678260084ECAD /* QuickLook.framework */, + ADC8F77E216678270084ECAD /* SystemConfiguration.framework */, ADE0863221239D0700945972 /* Accelerate.framework */, ADE0863021239CD900945972 /* MediaPlayer.framework */, ADE0862E21239C9100945972 /* AudioToolbox.framework */, @@ -499,6 +536,7 @@ AD06989820CC6C3E0010825F /* OSX */ = { isa = PBXGroup; children = ( + ADC8F775216675A80084ECAD /* HockeySDK.framework */, AD06989920CC6C4C0010825F /* ZipArchive.framework */, ); name = OSX; @@ -734,6 +772,7 @@ AD30D82E1F783E0100B6A112 /* libcurl.4.tbd */, AD759B661F27964D00211963 /* GLKit.framework */, AD759B641F2793AE00211963 /* OpenGLES.framework */, + ADC8F78821667C740084ECAD /* HockeySDK.framework */, AD787ADE20D4611100C4712A /* QuickLook.framework */, ); name = Frameworks; @@ -811,6 +850,7 @@ AD0E5C9A1ECC6F2B00C35669 /* Resources */, AD2286BB214E96E60074567E /* Versioning Info.plist */, AD30D8201F783B5600B6A112 /* CopyFiles */, + ADC8F77421665FD20084ECAD /* Hockeyapp */, ); buildRules = ( ); @@ -870,6 +910,7 @@ ADB86F66214EFC04004E7CB8 /* Versioning Info.plist */, AD06989C20CC89370010825F /* CopyFiles */, AD787AEE20D4611100C4712A /* Embed App Extensions */, + ADC8F7782166778C0084ECAD /* Hockeyapp */, ); buildRules = ( ); @@ -972,6 +1013,7 @@ ADD7D27C1EBF9AE300D5A897 /* Main.storyboard in Resources */, ADD7D27E1EBF9AE300D5A897 /* Assets.xcassets in Resources */, ADD7D2811EBF9AE300D5A897 /* LaunchScreen.storyboard in Resources */, + ADC8F786216678660084ECAD /* HockeySDK.embeddedframework in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1090,6 +1132,34 @@ shellPath = /bin/sh; shellScript = "# Use the commit count as CFBundleVersion\nGIT_COMMIT_COUNT=`git rev-list --count HEAD`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion ${GIT_COMMIT_COUNT}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n\n## Use the last annotated tag as CFBundleShortVersionString\nGIT_TAG=`git describe --tags --abbrev=0`\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString ${GIT_TAG}\" \"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n"; }; + ADC8F77421665FD20084ECAD /* Hockeyapp */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = Hockeyapp; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "FILE=\"${SRCROOT}/libs/hockeyapp/HockeySDK-Mac/BuildAgent\"\nif [ -f \"$FILE\" ]; then\n \"$FILE\"\nfi"; + }; + ADC8F7782166778C0084ECAD /* Hockeyapp */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = Hockeyapp; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "FILE=\"${SRCROOT}/libs/hockeyapp/HockeySDK-iOS/BuildAgent\"\nif [ -f \"$FILE\" ]; then\n \"$FILE\"\nfi"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -1333,6 +1403,7 @@ DEVELOPMENT_TEAM = ERD9AYQ49S; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/libs/hockeyapp/HockeySDK-Mac", ); INFOPLIST_FILE = "PanoPainter-OSX/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; @@ -1356,6 +1427,7 @@ DEVELOPMENT_TEAM = ERD9AYQ49S; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/libs/hockeyapp/HockeySDK-Mac", ); INFOPLIST_FILE = "PanoPainter-OSX/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; @@ -1670,6 +1742,8 @@ DEVELOPMENT_TEAM = ERD9AYQ49S; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/libs/hockeyapp/HockeySDK-iOS", + "$(PROJECT_DIR)/libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework", ); HEADER_SEARCH_PATHS = ( "/Users/omimac/Downloads/curl-android-ios-master/prebuilt-with-ssl/iOS/include", @@ -1707,6 +1781,8 @@ DEVELOPMENT_TEAM = ERD9AYQ49S; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PROJECT_DIR)/libs/hockeyapp/HockeySDK-iOS", + "$(PROJECT_DIR)/libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework", ); HEADER_SEARCH_PATHS = ( "/Users/omimac/Downloads/curl-android-ios-master/prebuilt-with-ssl/iOS/include", diff --git a/PanoPainter/AppDelegate.m b/PanoPainter/AppDelegate.m index efdf467..47847b9 100644 --- a/PanoPainter/AppDelegate.m +++ b/PanoPainter/AppDelegate.m @@ -10,6 +10,7 @@ #import "GameViewController.h" #include "app.h" #include +#import @interface AppDelegate () { GameViewController* view; @@ -52,6 +53,10 @@ } - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + [[BITHockeyManager sharedHockeyManager] configureWithIdentifier:@"c2dccca196294ecca8fd5d58af2738cf"]; + // Do some additional configuration if needed here + [[BITHockeyManager sharedHockeyManager] startManager]; + [[BITHockeyManager sharedHockeyManager].authenticator authenticateInstallation]; // sonarpen_driver = [[WTSonarPenDriver alloc] initWithApplication:application]; // [sonarpen_driver start]; // [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(penStatusChanged) name:WTSonarPenDriverStateChangedNotification object:nil]; diff --git a/libs/hockeyapp b/libs/hockeyapp new file mode 160000 index 0000000..f988757 --- /dev/null +++ b/libs/hockeyapp @@ -0,0 +1 @@ +Subproject commit f9887579c9196808cad21dd84f9d05d215ea0e1e