Skip to content

Commit 3d28e41

Browse files
philip-lambphilip-lamb
committed
Build tweaks.
1 parent d54639c commit 3d28e41

File tree

11 files changed

+73
-77
lines changed

11 files changed

+73
-77
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
depends/ios/include/ARX/
22
depends/ios/lib/libARX.a
3+
depends/ios/Frameworks/opencv2.framework
34
depends/macos/Frameworks/ARX.framework/
5+
depends/macos/Frameworks/opencv2.framework
46
Linux/build/
57
iOS/user-config.xcconfig
68
iOS/build/

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set -x
1919
# Get our location.
2020
OURDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2121

22-
SDK_VERSION='1.1'
22+
SDK_VERSION='1.1.8'
2323
# If the version number includes a dev build number, drop it.
2424
SDK_VERSION_CANON=`echo -n "${SDK_VERSION}" | sed -E -e 's/([0-9]+\.[0-9]+\.[0-9]+)(\.[0-9])?/\1/'`
2525
# If the tiny version number is 0, drop it.

‎iOS/ARViewController.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ - (IBAction)handleMenuButton:(id)sender {
13031303
]];
13041304
[alertController addAction:[UIAlertAction actionWithTitle:@"Help" style:UIAlertActionStyleDefault handler:
13051305
^(UIAlertAction *action) {
1306-
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://github.com/artoolkitx/artoolkitx-calibration/wiki"]];
1306+
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://github.com/artoolkitx/artoolkitx-calibration/wiki"] options:nil completionHandler:nil];
13071307
}
13081308
]];
13091309
[alertController addAction:[UIAlertAction actionWithTitle:@"Print" style:UIAlertActionStyleDefault handler:

‎iOS/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 68 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2,153 +2,147 @@
22
"images" : [
33
{
44
"idiom" : "iphone",
5-
"size" : "20x20",
6-
"scale" : "2x"
5+
"scale" : "2x",
6+
"size" : "20x20"
77
},
88
{
99
"idiom" : "iphone",
10-
"size" : "20x20",
11-
"scale" : "3x"
10+
"scale" : "3x",
11+
"size" : "20x20"
1212
},
1313
{
14-
"size" : "29x29",
15-
"idiom" : "iphone",
1614
"filename" : "Icon-Small.png",
17-
"scale" : "1x"
15+
"idiom" : "iphone",
16+
"scale" : "1x",
17+
"size" : "29x29"
1818
},
1919
{
20-
"size" : "29x29",
21-
"idiom" : "iphone",
2220
"filename" : "[email protected]",
23-
"scale" : "2x"
21+
"idiom" : "iphone",
22+
"scale" : "2x",
23+
"size" : "29x29"
2424
},
2525
{
26-
"size" : "29x29",
27-
"idiom" : "iphone",
2826
"filename" : "[email protected]",
29-
"scale" : "3x"
27+
"idiom" : "iphone",
28+
"scale" : "3x",
29+
"size" : "29x29"
3030
},
3131
{
32-
"size" : "40x40",
33-
"idiom" : "iphone",
3432
"filename" : "[email protected]",
35-
"scale" : "2x"
33+
"idiom" : "iphone",
34+
"scale" : "2x",
35+
"size" : "40x40"
3636
},
3737
{
38-
"size" : "40x40",
39-
"idiom" : "iphone",
4038
"filename" : "[email protected]",
41-
"scale" : "3x"
39+
"idiom" : "iphone",
40+
"scale" : "3x",
41+
"size" : "40x40"
4242
},
4343
{
44-
"size" : "57x57",
4544
"idiom" : "iphone",
46-
"filename" : "Icon.png",
47-
"scale" : "1x"
45+
"scale" : "1x",
46+
"size" : "57x57"
4847
},
4948
{
50-
"size" : "57x57",
5149
"idiom" : "iphone",
52-
"filename" : "[email protected]",
53-
"scale" : "2x"
50+
"scale" : "2x",
51+
"size" : "57x57"
5452
},
5553
{
56-
"size" : "60x60",
57-
"idiom" : "iphone",
5854
"filename" : "[email protected]",
59-
"scale" : "2x"
55+
"idiom" : "iphone",
56+
"scale" : "2x",
57+
"size" : "60x60"
6058
},
6159
{
62-
"size" : "60x60",
63-
"idiom" : "iphone",
6460
"filename" : "[email protected]",
65-
"scale" : "3x"
61+
"idiom" : "iphone",
62+
"scale" : "3x",
63+
"size" : "60x60"
6664
},
6765
{
6866
"idiom" : "ipad",
69-
"size" : "20x20",
70-
"scale" : "1x"
67+
"scale" : "1x",
68+
"size" : "20x20"
7169
},
7270
{
7371
"idiom" : "ipad",
74-
"size" : "20x20",
75-
"scale" : "2x"
72+
"scale" : "2x",
73+
"size" : "20x20"
7674
},
7775
{
78-
"size" : "29x29",
79-
"idiom" : "ipad",
8076
"filename" : "Icon-Small.png",
81-
"scale" : "1x"
77+
"idiom" : "ipad",
78+
"scale" : "1x",
79+
"size" : "29x29"
8280
},
8381
{
84-
"size" : "29x29",
85-
"idiom" : "ipad",
8682
"filename" : "[email protected]",
87-
"scale" : "2x"
83+
"idiom" : "ipad",
84+
"scale" : "2x",
85+
"size" : "29x29"
8886
},
8987
{
90-
"size" : "40x40",
91-
"idiom" : "ipad",
9288
"filename" : "Icon-40.png",
93-
"scale" : "1x"
89+
"idiom" : "ipad",
90+
"scale" : "1x",
91+
"size" : "40x40"
9492
},
9593
{
96-
"size" : "40x40",
97-
"idiom" : "ipad",
9894
"filename" : "[email protected]",
99-
"scale" : "2x"
95+
"idiom" : "ipad",
96+
"scale" : "2x",
97+
"size" : "40x40"
10098
},
10199
{
102-
"size" : "50x50",
103100
"idiom" : "ipad",
104-
"filename" : "Icon-Small-50.png",
105-
"scale" : "1x"
101+
"scale" : "1x",
102+
"size" : "50x50"
106103
},
107104
{
108-
"size" : "50x50",
109105
"idiom" : "ipad",
110-
"filename" : "[email protected]",
111-
"scale" : "2x"
106+
"scale" : "2x",
107+
"size" : "50x50"
112108
},
113109
{
114-
"size" : "72x72",
115110
"idiom" : "ipad",
116-
"filename" : "Icon-72.png",
117-
"scale" : "1x"
111+
"scale" : "1x",
112+
"size" : "72x72"
118113
},
119114
{
120-
"size" : "72x72",
121115
"idiom" : "ipad",
122-
"filename" : "[email protected]",
123-
"scale" : "2x"
116+
"scale" : "2x",
117+
"size" : "72x72"
124118
},
125119
{
126-
"size" : "76x76",
127-
"idiom" : "ipad",
128120
"filename" : "Icon-76.png",
129-
"scale" : "1x"
121+
"idiom" : "ipad",
122+
"scale" : "1x",
123+
"size" : "76x76"
130124
},
131125
{
132-
"size" : "76x76",
133-
"idiom" : "ipad",
134126
"filename" : "[email protected]",
135-
"scale" : "2x"
127+
"idiom" : "ipad",
128+
"scale" : "2x",
129+
"size" : "76x76"
136130
},
137131
{
138-
"size" : "83.5x83.5",
139-
"idiom" : "ipad",
140132
"filename" : "Icon-167.png",
141-
"scale" : "2x"
133+
"idiom" : "ipad",
134+
"scale" : "2x",
135+
"size" : "83.5x83.5"
142136
},
143137
{
144-
"size" : "1024x1024",
145-
"idiom" : "ios-marketing",
146138
"filename" : "Icon-1024.png",
147-
"scale" : "1x"
139+
"idiom" : "ios-marketing",
140+
"scale" : "1x",
141+
"size" : "1024x1024"
148142
}
149143
],
150144
"info" : {
151-
"version" : 1,
152-
"author" : "xcode"
145+
"author" : "xcode",
146+
"version" : 1
153147
}
154-
}
148+
}

‎iOS/Images.xcassets/AppIcon.appiconset/Icon-72.png‎

-8.42 KB
Binary file not shown.

‎iOS/Images.xcassets/AppIcon.appiconset/[email protected]‎

-27.3 KB
Binary file not shown.

‎iOS/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png‎

-4.88 KB
Binary file not shown.

‎iOS/Images.xcassets/AppIcon.appiconset/[email protected]‎

-14.5 KB
Binary file not shown.

‎iOS/Images.xcassets/AppIcon.appiconset/Icon.png‎

-5.77 KB
Binary file not shown.

‎iOS/Images.xcassets/AppIcon.appiconset/[email protected]‎

-18.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)