Skip to content

Commit

Permalink
Fixes for Step 14
Browse files Browse the repository at this point in the history
* AGK Build Fixes for Step 14
  • Loading branch information
LeeBamberTGC committed Feb 27, 2024
1 parent a31785a commit d96b47e
Show file tree
Hide file tree
Showing 18 changed files with 48 additions and 461 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,15 @@ AGK/apps/interpreter/Final
AGK/apps/template_windows/Release64
AGK/apps/template_windows/Final
AGK/Agkide/Release64
AGK/Agkide/Final
AGK/libprojects/android_assimp/log.txt
AGK/libprojects/android_assimp/obj
AGK/libprojects/android_base/obj
AGK/libprojects/android_bullet/obj
AGK/libprojects/android_curl/obj
AGK_Build/Builds/Studio/AGKStudioWindows/media
AGK/libprojects/android_base/log.txt
AGK/libprojects/android_bullet/log.txt
AGK/libprojects/android_curl/log.txt
AGK_Build/Builds/Studio/AGKStudioWindows/Ide.exe
AGK/AgkIde/Final/Ide.exe
2 changes: 1 addition & 1 deletion AGK/AgkIde/Final/Ide.exe
Git LFS file not shown
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions AGK/libprojects/android_base/copylibs-nopause.bat
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ copy /y "..\..\platform\android\ARCore\libs\arm64-v8a\libarcore_sdk.so" "..\..\a
if not %ERRORLEVEL% equ 0 ( GOTO failed )
:NOAPP2

IF NOT EXIST ..\..\apps\interpreter_android_google_addapptr GOTO NOAPP3
copy /y "..\..\platform\android\ARCore\libs\armeabi-v7a\libarcore_sdk.so" "..\..\apps\interpreter_android_google_addapptr\AGKPlayer2\src\main\jniLibs\armeabi-v7a\libarcore_sdk.so"
IF NOT EXIST ..\..\apps\interpreter_android_google_noads GOTO NOAPP3
copy /y "..\..\platform\android\ARCore\libs\armeabi-v7a\libarcore_sdk.so" "..\..\apps\interpreter_android_google_noads\AGKPlayer2\src\main\jniLibs\armeabi-v7a\libarcore_sdk.so"
if not %ERRORLEVEL% equ 0 ( GOTO failed )
copy /y "..\..\platform\android\ARCore\libs\arm64-v8a\libarcore_sdk.so" "..\..\apps\interpreter_android_google_addapptr\AGKPlayer2\src\main\jniLibs\arm64-v8a\libarcore_sdk.so"
copy /y "..\..\platform\android\ARCore\libs\arm64-v8a\libarcore_sdk.so" "..\..\apps\interpreter_android_google_noads\AGKPlayer2\src\main\jniLibs\arm64-v8a\libarcore_sdk.so"
if not %ERRORLEVEL% equ 0 ( GOTO failed )
:NOAPP3

Expand Down
413 changes: 8 additions & 405 deletions AGK/libprojects/android_base/log.txt

Large diffs are not rendered by default.

27 changes: 0 additions & 27 deletions AGK/libprojects/android_bullet/log.txt
Original file line number Diff line number Diff line change
@@ -1,27 +0,0 @@
jni/../../../bullet/BulletFileLoader/bFile.cpp:1275:21: warning: format specifies type 'int' but the argument has type 'void *' [-Wformat]
printf("%d ", array[a]);
~~ ^~~~~~~~
jni/../../../bullet/BulletFileLoader/bFile.cpp:1293:20: warning: format specifies type 'int' but the argument has type 'void *' [-Wformat]
printf("%d ", ptr);
~~ ^~~
jni/../../../bullet/BulletFileLoader/bFile.cpp:1474:42: warning: format specifies type 'int' but the argument has type 'void *' [-Wformat]
printf(" <%s pointer=%d>\n",oldType,dataChunk.oldPtr);
~~ ^~~~~~~~~~~~~~~~
3 warnings generated.
jni/../../../bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp:81:51: warning: cast to 'void *' from smaller integer type 'int' [-Wint-to-void-pointer-cast]
child.m_node = m_dynamicAabbTree->insert(bounds,(void*)index);
^
jni/../../../bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp:315:61: warning: cast to 'void *' from smaller integer type 'int' [-Wint-to-void-pointer-cast]
child.m_node = m_dynamicAabbTree->insert(bounds,(void*)index);
^
2 warnings generated.
jni/../../../bullet/BulletFileLoader/bFile.cpp:1275:21: warning: format specifies type 'int' but the argument has type 'void *' [-Wformat]
printf("%d ", array[a]);
~~ ^~~~~~~~
jni/../../../bullet/BulletFileLoader/bFile.cpp:1293:20: warning: format specifies type 'int' but the argument has type 'void *' [-Wformat]
printf("%d ", ptr);
~~ ^~~
jni/../../../bullet/BulletFileLoader/bFile.cpp:1474:42: warning: format specifies type 'int' but the argument has type 'void *' [-Wformat]
printf(" <%s pointer=%d>\n",oldType,dataChunk.oldPtr);
~~ ^~~~~~~~~~~~~~~~
3 warnings generated.
25 changes: 0 additions & 25 deletions AGK/libprojects/android_curl/log.txt
Original file line number Diff line number Diff line change
@@ -1,25 +0,0 @@
jni/../../../curl/mbedTLS/net_sockets.c:332:37: warning: passing 'int *' to parameter of type 'socklen_t *' (aka 'unsigned int *') converts between pointers to integer types with different sign [-Wpointer-sign]
(void *) &type, &type_len ) != 0 ||
^~~~~~~~~
D:/AGK_Build/External/android-ndk-r20b/build//../toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include\sys/socket.h:311:92: note: passing argument to parameter '__value_length' here
__socketcall int getsockopt(int __fd, int __level, int __option, void* __value, socklen_t* __value_length);
^
jni/../../../curl/mbedTLS/net_sockets.c:342:80: warning: passing 'int *' to parameter of type 'socklen_t *' (aka 'unsigned int *') converts between pointers to integer types with different sign [-Wpointer-sign]
(struct sockaddr *) &client_addr, &n );
^~
D:/AGK_Build/External/android-ndk-r20b/build//../toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include\sys/socket.h:301:71: note: passing argument to parameter '__addr_length' here
__socketcall int accept(int __fd, struct sockaddr* __addr, socklen_t* __addr_length);
^
jni/../../../curl/mbedTLS/net_sockets.c:350:59: warning: passing 'int *' to parameter of type 'socklen_t *' (aka 'unsigned int *') converts between pointers to integer types with different sign [-Wpointer-sign]
(struct sockaddr *) &client_addr, &n );
^~
D:/AGK_Build/External/android-ndk-r20b/build//../toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include\sys/socket.h:335:119: note: passing argument to parameter '__src_addr_length' here
__socketcall ssize_t recvfrom(int __fd, void* __buf, size_t __n, int __flags, struct sockaddr* __src_addr, socklen_t* __src_addr_length);
^
jni/../../../curl/mbedTLS/net_sockets.c:385:59: warning: passing 'int *' to parameter of type 'socklen_t *' (aka 'unsigned int *') converts between pointers to integer types with different sign [-Wpointer-sign]
(struct sockaddr *) &local_addr, &n ) != 0 ||
^~
D:/AGK_Build/External/android-ndk-r20b/build//../toolchains/llvm/prebuilt/windows-x86_64/sysroot/usr/include\sys/socket.h:310:76: note: passing argument to parameter '__addr_length' here
__socketcall int getsockname(int __fd, struct sockaddr* __addr, socklen_t* __addr_length);
^
4 warnings generated.
3 changes: 3 additions & 0 deletions AGK/platform/android/jni/arm64-v8a/libAGKAndroid.a
Git LFS file not shown
3 changes: 3 additions & 0 deletions AGK/platform/android/jni/arm64-v8a/libAGKAssimp.a
Git LFS file not shown
3 changes: 3 additions & 0 deletions AGK/platform/android/jni/arm64-v8a/libAGKBullet.a
Git LFS file not shown
3 changes: 3 additions & 0 deletions AGK/platform/android/jni/arm64-v8a/libAGKCurl.a
Git LFS file not shown
3 changes: 3 additions & 0 deletions AGK/platform/android/jni/armeabi-v7a/libAGKAndroid.a
Git LFS file not shown
3 changes: 3 additions & 0 deletions AGK/platform/android/jni/armeabi-v7a/libAGKAssimp.a
Git LFS file not shown
3 changes: 3 additions & 0 deletions AGK/platform/android/jni/armeabi-v7a/libAGKBullet.a
Git LFS file not shown
3 changes: 3 additions & 0 deletions AGK/platform/android/jni/armeabi-v7a/libAGKCurl.a
Git LFS file not shown

0 comments on commit d96b47e

Please sign in to comment.