Skip to content

Commit c60263a

Browse files
ThorstenBuxThorstenBux
committed
WIP fix Android build
1 parent f78f415 commit c60263a

File tree

12 files changed

+39
-47
lines changed

12 files changed

+39
-47
lines changed

‎ARToolKit5iOS.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7087,29 +7087,12 @@
70877087
attributes = {
70887088
LastUpgradeCheck = 0730;
70897089
TargetAttributes = {
7090-
4A1302AB15BDFF14003A441C = {
7091-
DevelopmentTeam = 7DJXLNF77X;
7092-
};
7093-
4A1302FF15BDFF17003A441C = {
7094-
DevelopmentTeam = 7DJXLNF77X;
7095-
};
7096-
4A2F72D7117840A600F35FA7 = {
7097-
DevelopmentTeam = 7DJXLNF77X;
7098-
};
7099-
4A3D4297130D1F2500E64C33 = {
7100-
DevelopmentTeam = 7DJXLNF77X;
7101-
};
7102-
4A4BAA7C1B745B210012B77D = {
7103-
DevelopmentTeam = 7DJXLNF77X;
7104-
};
71057090
4A50D6FC1164E16D00ED169B = {
71067091
DevelopmentTeam = 7DJXLNF77X;
71077092
};
7108-
4A5BAA5B13D82BC000C8D5E7 = {
7109-
DevelopmentTeam = 7DJXLNF77X;
7110-
};
71117093
4AEAEBAD17A744AA00F61E33 = {
71127094
DevelopmentTeam = 7DJXLNF77X;
7095+
ProvisioningStyle = Automatic;
71137096
};
71147097
};
71157098
};
@@ -8380,7 +8363,7 @@
83808363
isa = XCBuildConfiguration;
83818364
buildSettings = {
83828365
CODE_SIGN_IDENTITY = "iPhone Developer";
8383-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8366+
DEVELOPMENT_TEAM = "";
83848367
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
83858368
GCC_PRECOMPILE_PREFIX_HEADER = YES;
83868369
GCC_PREFIX_HEADER = examples/ARAppNFTOSG/ARAppNFTOSG_Prefix.pch;
@@ -8401,7 +8384,7 @@
84018384
isa = XCBuildConfiguration;
84028385
buildSettings = {
84038386
CODE_SIGN_IDENTITY = "iPhone Developer";
8404-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8387+
DEVELOPMENT_TEAM = "";
84058388
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
84068389
GCC_PRECOMPILE_PREFIX_HEADER = YES;
84078390
GCC_PREFIX_HEADER = examples/ARAppNFTOSG/ARAppNFTOSG_Prefix.pch;
@@ -8423,7 +8406,7 @@
84238406
buildSettings = {
84248407
CODE_SIGN_ENTITLEMENTS = examples/ARAppOSG/dist.plist;
84258408
CODE_SIGN_IDENTITY = "iPhone Distribution";
8426-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8409+
DEVELOPMENT_TEAM = "";
84278410
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
84288411
GCC_PRECOMPILE_PREFIX_HEADER = YES;
84298412
GCC_PREFIX_HEADER = examples/ARAppNFTOSG/ARAppNFTOSG_Prefix.pch;
@@ -8446,7 +8429,7 @@
84468429
isa = XCBuildConfiguration;
84478430
buildSettings = {
84488431
CODE_SIGN_IDENTITY = "iPhone Developer";
8449-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8432+
DEVELOPMENT_TEAM = "";
84508433
GCC_PRECOMPILE_PREFIX_HEADER = YES;
84518434
GCC_PREFIX_HEADER = examples/ARAppNFT/ARAppNFT_Prefix.pch;
84528435
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -8465,7 +8448,7 @@
84658448
isa = XCBuildConfiguration;
84668449
buildSettings = {
84678450
CODE_SIGN_IDENTITY = "iPhone Developer";
8468-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8451+
DEVELOPMENT_TEAM = "";
84698452
GCC_PRECOMPILE_PREFIX_HEADER = YES;
84708453
GCC_PREFIX_HEADER = examples/ARAppNFT/ARAppNFT_Prefix.pch;
84718454
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -8485,7 +8468,7 @@
84858468
buildSettings = {
84868469
CODE_SIGN_ENTITLEMENTS = examples/ARApp2/dist.plist;
84878470
CODE_SIGN_IDENTITY = "iPhone Distribution";
8488-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8471+
DEVELOPMENT_TEAM = "";
84898472
GCC_PRECOMPILE_PREFIX_HEADER = YES;
84908473
GCC_PREFIX_HEADER = examples/ARAppNFT/ARAppNFT_Prefix.pch;
84918474
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -8564,7 +8547,7 @@
85648547
isa = XCBuildConfiguration;
85658548
buildSettings = {
85668549
CODE_SIGN_IDENTITY = "iPhone Developer";
8567-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8550+
DEVELOPMENT_TEAM = "";
85688551
GCC_PRECOMPILE_PREFIX_HEADER = YES;
85698552
GCC_PREFIX_HEADER = examples/ARApp2/ARApp2_Prefix.pch;
85708553
INFOPLIST_FILE = "examples/ARApp2/ARApp2-Info.plist";
@@ -8580,7 +8563,7 @@
85808563
isa = XCBuildConfiguration;
85818564
buildSettings = {
85828565
CODE_SIGN_IDENTITY = "iPhone Developer";
8583-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8566+
DEVELOPMENT_TEAM = "";
85848567
GCC_PRECOMPILE_PREFIX_HEADER = YES;
85858568
GCC_PREFIX_HEADER = examples/ARApp2/ARApp2_Prefix.pch;
85868569
INFOPLIST_FILE = "examples/ARApp2/ARApp2-Info.plist";
@@ -8597,7 +8580,7 @@
85978580
buildSettings = {
85988581
CODE_SIGN_ENTITLEMENTS = examples/ARApp2/dist.plist;
85998582
CODE_SIGN_IDENTITY = "iPhone Distribution";
8600-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8583+
DEVELOPMENT_TEAM = "";
86018584
GCC_PRECOMPILE_PREFIX_HEADER = YES;
86028585
GCC_PREFIX_HEADER = examples/ARApp2/ARApp2_Prefix.pch;
86038586
INFOPLIST_FILE = "examples/ARApp2/ARApp2-Info.plist";
@@ -8614,7 +8597,7 @@
86148597
isa = XCBuildConfiguration;
86158598
buildSettings = {
86168599
CODE_SIGN_IDENTITY = "iPhone Developer";
8617-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8600+
DEVELOPMENT_TEAM = "";
86188601
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
86198602
GCC_PRECOMPILE_PREFIX_HEADER = YES;
86208603
GCC_PREFIX_HEADER = examples/ARAppOSG/ARAppOSG_Prefix.pch;
@@ -8631,7 +8614,7 @@
86318614
isa = XCBuildConfiguration;
86328615
buildSettings = {
86338616
CODE_SIGN_IDENTITY = "iPhone Developer";
8634-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8617+
DEVELOPMENT_TEAM = "";
86358618
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
86368619
GCC_PRECOMPILE_PREFIX_HEADER = YES;
86378620
GCC_PREFIX_HEADER = examples/ARAppOSG/ARAppOSG_Prefix.pch;
@@ -8649,7 +8632,7 @@
86498632
buildSettings = {
86508633
CODE_SIGN_ENTITLEMENTS = examples/ARAppOSG/dist.plist;
86518634
CODE_SIGN_IDENTITY = "iPhone Distribution";
8652-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8635+
DEVELOPMENT_TEAM = "";
86538636
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
86548637
GCC_PRECOMPILE_PREFIX_HEADER = YES;
86558638
GCC_PREFIX_HEADER = examples/ARAppOSG/ARAppOSG_Prefix.pch;
@@ -8669,7 +8652,7 @@
86698652
buildSettings = {
86708653
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
86718654
CODE_SIGN_IDENTITY = "iPhone Developer";
8672-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8655+
DEVELOPMENT_TEAM = "";
86738656
GCC_PRECOMPILE_PREFIX_HEADER = YES;
86748657
GCC_PREFIX_HEADER = examples/ARAppCameraTest/ARAppCameraTest_Prefix.pch;
86758658
INFOPLIST_FILE = "examples/ARAppCameraTest/ARAppCameraTest-Info.plist";
@@ -8686,7 +8669,7 @@
86868669
buildSettings = {
86878670
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
86888671
CODE_SIGN_IDENTITY = "iPhone Developer";
8689-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8672+
DEVELOPMENT_TEAM = "";
86908673
GCC_PRECOMPILE_PREFIX_HEADER = YES;
86918674
GCC_PREFIX_HEADER = examples/ARAppCameraTest/ARAppCameraTest_Prefix.pch;
86928675
INFOPLIST_FILE = "examples/ARAppCameraTest/ARAppCameraTest-Info.plist";
@@ -8704,7 +8687,7 @@
87048687
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
87058688
CODE_SIGN_ENTITLEMENTS = examples/ARAppCameraTest/dist.plist;
87068689
CODE_SIGN_IDENTITY = "iPhone Distribution";
8707-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8690+
DEVELOPMENT_TEAM = "";
87088691
GCC_PRECOMPILE_PREFIX_HEADER = YES;
87098692
GCC_PREFIX_HEADER = examples/ARAppCameraTest/ARAppCameraTest_Prefix.pch;
87108693
INFOPLIST_FILE = "examples/ARAppCameraTest/ARAppCameraTest-Info.plist";
@@ -8771,7 +8754,7 @@
87718754
isa = XCBuildConfiguration;
87728755
buildSettings = {
87738756
CODE_SIGN_IDENTITY = "iPhone Developer";
8774-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8757+
DEVELOPMENT_TEAM = "";
87758758
GCC_PRECOMPILE_PREFIX_HEADER = YES;
87768759
GCC_PREFIX_HEADER = examples/ARAppMovie/ARAppMovie_Prefix.pch;
87778760
INFOPLIST_FILE = "examples/ARAppMovie/ARAppMovie-Info.plist";
@@ -8786,7 +8769,7 @@
87868769
isa = XCBuildConfiguration;
87878770
buildSettings = {
87888771
CODE_SIGN_IDENTITY = "iPhone Developer";
8789-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8772+
DEVELOPMENT_TEAM = "";
87908773
GCC_PRECOMPILE_PREFIX_HEADER = YES;
87918774
GCC_PREFIX_HEADER = examples/ARAppMovie/ARAppMovie_Prefix.pch;
87928775
INFOPLIST_FILE = "examples/ARAppMovie/ARAppMovie-Info.plist";
@@ -8802,7 +8785,7 @@
88028785
buildSettings = {
88038786
CODE_SIGN_ENTITLEMENTS = examples/ARAppMovie/dist.plist;
88048787
CODE_SIGN_IDENTITY = "iPhone Distribution";
8805-
DEVELOPMENT_TEAM = 7DJXLNF77X;
8788+
DEVELOPMENT_TEAM = "";
88068789
GCC_PRECOMPILE_PREFIX_HEADER = YES;
88078790
GCC_PREFIX_HEADER = examples/ARAppMovie/ARAppMovie_Prefix.pch;
88088791
INFOPLIST_FILE = "examples/ARAppMovie/ARAppMovie-Info.plist";
@@ -9325,13 +9308,16 @@
93259308
isa = XCBuildConfiguration;
93269309
buildSettings = {
93279310
CODE_SIGN_IDENTITY = "iPhone Developer";
9311+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
9312+
CODE_SIGN_STYLE = Automatic;
93289313
DEVELOPMENT_TEAM = 7DJXLNF77X;
93299314
GCC_PRECOMPILE_PREFIX_HEADER = YES;
93309315
GCC_PREFIX_HEADER = examples/ARAppES1/ARAppES1_Prefix.pch;
93319316
INFOPLIST_FILE = "examples/ARAppES1/ARAppES1-Info.plist";
93329317
OTHER_LDFLAGS = "-lsqlite3";
93339318
PRODUCT_BUNDLE_IDENTIFIER = "org.artoolkit.${PRODUCT_NAME:identifier}";
93349319
PRODUCT_NAME = ARAppES1;
9320+
PROVISIONING_PROFILE_SPECIFIER = "";
93359321
TARGETED_DEVICE_FAMILY = "1,2";
93369322
};
93379323
name = Debug;
@@ -9340,13 +9326,16 @@
93409326
isa = XCBuildConfiguration;
93419327
buildSettings = {
93429328
CODE_SIGN_IDENTITY = "iPhone Developer";
9329+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
9330+
CODE_SIGN_STYLE = Automatic;
93439331
DEVELOPMENT_TEAM = 7DJXLNF77X;
93449332
GCC_PRECOMPILE_PREFIX_HEADER = YES;
93459333
GCC_PREFIX_HEADER = examples/ARAppES1/ARAppES1_Prefix.pch;
93469334
INFOPLIST_FILE = "examples/ARAppES1/ARAppES1-Info.plist";
93479335
OTHER_LDFLAGS = "-lsqlite3";
93489336
PRODUCT_BUNDLE_IDENTIFIER = "org.artoolkit.${PRODUCT_NAME:identifier}";
93499337
PRODUCT_NAME = ARAppES1;
9338+
PROVISIONING_PROFILE_SPECIFIER = "";
93509339
TARGETED_DEVICE_FAMILY = "1,2";
93519340
};
93529341
name = Release;
@@ -9356,6 +9345,8 @@
93569345
buildSettings = {
93579346
CODE_SIGN_ENTITLEMENTS = examples/ARAppES1/dist.plist;
93589347
CODE_SIGN_IDENTITY = "iPhone Distribution";
9348+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
9349+
CODE_SIGN_STYLE = Automatic;
93599350
DEVELOPMENT_TEAM = 7DJXLNF77X;
93609351
GCC_PRECOMPILE_PREFIX_HEADER = YES;
93619352
GCC_PREFIX_HEADER = examples/ARAppES1/ARAppES1_Prefix.pch;
@@ -9364,6 +9355,7 @@
93649355
PRODUCT_BUNDLE_IDENTIFIER = "org.artoolkit.${PRODUCT_NAME:identifier}";
93659356
PRODUCT_NAME = ARAppES1;
93669357
PROVISIONING_PROFILE = "";
9358+
PROVISIONING_PROFILE_SPECIFIER = "";
93679359
TARGETED_DEVICE_FAMILY = "1,2";
93689360
VALIDATE_PRODUCT = YES;
93699361
};

‎AndroidStudioProjects/ARMovieProj/aRMovie/src/main/jni/Application.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ APP_MODULES := ARMovieNative
5252
APP_OPTIM := release
5353
#APP_OPTIM := debug
5454
#APP_ABI := all
55-
APP_ABI := armeabi armeabi-v7a x86 mips
55+
APP_ABI := armeabi-v7a x86
5656
#APP_ABI := armeabi armeabi-v7a x86 arm64-v8a x86_64 mips64
5757
APP_PLATFORM := android-15
5858
APP_STL := c++_shared

‎AndroidStudioProjects/ARNativeES1Proj/aRNativeES1/src/main/jni/Application.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ APP_MODULES := ARNativeES1
5252
#APP_OPTIM := release
5353
#APP_OPTIM := debug
5454
#APP_ABI := all
55-
APP_ABI := armeabi armeabi-v7a x86 mips
55+
APP_ABI := armeabi-v7a x86
5656
#APP_ABI := armeabi armeabi-v7a x86 mips arm64-v8a x86_64 mips64
5757
APP_PLATFORM := android-15
5858
NDK_TOOLCHAIN_VERSION := clang

‎AndroidStudioProjects/ARNativeOSGProj/aRNativeOSG/src/main/jni/Application.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ APP_MODULES := ARNativeOSGNative
5252
APP_OPTIM := release
5353
#APP_OPTIM := debug
5454
#APP_ABI := all
55-
APP_ABI := armeabi armeabi-v7a x86 mips
55+
APP_ABI := armeabi-v7a x86
5656
#APP_ABI := armeabi armeabi-v7a x86 mips arm64-v8a x86_64 mips64
5757
APP_PLATFORM := android-15
5858
APP_STL := c++_shared

‎AndroidStudioProjects/ARNativeProj/aRNative/src/main/jni/Application.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ APP_MODULES := ARNative
5252
#APP_OPTIM := release
5353
#APP_OPTIM := debug
5454
#APP_ABI := all
55-
APP_ABI := armeabi armeabi-v7a x86 mips
55+
APP_ABI := armeabi-v7a x86
5656
#APP_ABI := armeabi armeabi-v7a x86 mips arm64-v8a x86_64 mips64
5757
APP_PLATFORM := android-15
5858
NDK_TOOLCHAIN_VERSION := clang

‎AndroidStudioProjects/ARSimpleNativeCarsProj/aRSimpleNativeCars/src/main/jni/Application.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ APP_MODULES := ARWrapper ARWrapperNativeCarsExample
5252
APP_OPTIM := release
5353
#APP_OPTIM := debug
5454
#APP_ABI := all
55-
APP_ABI := armeabi armeabi-v7a x86 mips
55+
APP_ABI := armeabi-v7a x86
5656
#APP_ABI := armeabi armeabi-v7a x86 mips arm64-v8a x86_64 mips64
5757
APP_PLATFORM := android-15
5858
APP_STL := c++_shared

‎AndroidStudioProjects/ARSimpleNativeProj/aRSimpleNative/src/main/jni/Application.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ APP_MODULES := ARWrapper ARWrapperNativeExample
5252
APP_OPTIM := release
5353
#APP_OPTIM := debug
5454
#APP_ABI := all
55-
APP_ABI := armeabi armeabi-v7a x86 mips
55+
APP_ABI := armeabi-v7a x86
5656
#APP_ABI := armeabi armeabi-v7a x86 mips arm64-v8a x86_64 mips64
5757
APP_PLATFORM := android-15
5858
APP_STL := c++_shared

‎AndroidStudioProjects/calib_opticalProj/calib_optical/src/main/jni/Application.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ APP_MODULES := calib_optical_Native
4040
#APP_OPTIM := release
4141
#APP_OPTIM := debug
4242
#APP_ABI := all
43-
APP_ABI := armeabi armeabi-v7a x86 mips
43+
APP_ABI := armeabi-v7a x86
4444
#APP_ABI := armeabi armeabi-v7a x86 mips arm64-v8a x86_64 mips64
4545
APP_PLATFORM := android-15
4646
APP_STL := c++_shared

‎AndroidStudioProjects/nftBookProj/nftBook/src/main/jni/Application.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ APP_MODULES := nftBookNative
5252
#APP_OPTIM := release
5353
#APP_OPTIM := debug
5454
#APP_ABI := all
55-
APP_ABI := armeabi armeabi-v7a x86 mips
55+
APP_ABI := armeabi-v7a x86
5656
#APP_ABI := armeabi armeabi-v7a x86 mips arm64-v8a x86_64 mips64
5757
APP_PLATFORM := android-15
5858
APP_STL := c++_shared

‎android/jni/Android-ARWrapper.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ LOCAL_SRC_FILES := $(MY_FILES)
116116

117117
LOCAL_C_INCLUDES += $(ARTOOLKIT_ROOT)/include/android $(ARTOOLKIT_ROOT)/include
118118
LOCAL_CFLAGS += -DHAVE_NFT=1 $(MY_CFLAGS)
119-
LOCAL_LDLIBS += -llog -lGLESv1_CM -lz
119+
LOCAL_LDLIBS += -llog -lGLESv1_CM -lz -lfts
120120
LOCAL_WHOLE_STATIC_LIBRARIES += ar
121121
LOCAL_STATIC_LIBRARIES += ar2 kpm argsub_es armulti aricp arvideo arutil jpeg cpufeatures
122122
#LOCAL_SHARED_LIBRARIES += $(CURL_LIBS)

0 commit comments

Comments
 (0)