Skip to content

Commit a69382c

Browse files
committed
Merge branch 'master' of https://github.com/SpaWn2KiLl/mobile into protocol_documentation
2 parents b8065dd + 4e6c292 commit a69382c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1880
-2764
lines changed

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,21 @@ last-change
33
*.apk
44
*.app
55
*.framework
6+
*.xcframework
67
*.aar
8+
*.jar
79
*.iml
810
.idea
911
.gradle
12+
*.properties
13+
.DS_Store
14+
example/ivy/**/build/
15+
example/ivy/android/gradle/
16+
17+
# Xcode configuration files.
18+
*.xcworkspace
19+
xcuserdata
20+
*.entitlements
1021

1122
# Android Studio build and IDE configuration files.
1223
example/bind/android/local.properties

app/darwin_desktop.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ func main(f func(App)) {
5959
go func() {
6060
f(theApp)
6161
C.stopApp()
62-
// TODO(crawshaw): trigger runApp to return
6362
}()
6463

6564
C.runApp()

app/x11.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <EGL/egl.h>
99
#include <GLES2/gl2.h>
1010
#include <X11/Xlib.h>
11+
#include <X11/Xutil.h>
1112
#include <stdio.h>
1213
#include <stdlib.h>
1314

bind/objc/seq_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ const pbxproj = `// !$*UTF8*$!
604604
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
605605
CLANG_WARN_UNREACHABLE_CODE = YES;
606606
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
607-
CODE_SIGN_IDENTITY = "iPhone Developer";
607+
CODE_SIGN_IDENTITY = "Apple Development";
608608
COPY_PHASE_STRIP = NO;
609609
DEBUG_INFORMATION_FORMAT = dwarf;
610610
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -662,7 +662,7 @@ const pbxproj = `// !$*UTF8*$!
662662
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
663663
CLANG_WARN_UNREACHABLE_CODE = YES;
664664
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
665-
CODE_SIGN_IDENTITY = "iPhone Developer";
665+
CODE_SIGN_IDENTITY = "Apple Development";
666666
COPY_PHASE_STRIP = NO;
667667
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
668668
ENABLE_NS_ASSERTIONS = NO;

0 commit comments

Comments
 (0)