Skip to content

Commit

Permalink
Fixes to Step 15
Browse files Browse the repository at this point in the history
* AGK Build Fixes to Step 15
  • Loading branch information
LeeBamberTGC committed Feb 27, 2024
1 parent d96b47e commit fb2fefd
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 1,977 deletions.
22 changes: 22 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,25 @@ AGK/libprojects/android_bullet/log.txt
AGK/libprojects/android_curl/log.txt
AGK_Build/Builds/Studio/AGKStudioWindows/Ide.exe
AGK/AgkIde/Final/Ide.exe
AGK/libprojects/android_assimp/log.txt
AGK/apps/interpreter_android_google/AGKPlayer2/jniObjs
AGK/apps/interpreter_android_google/AGKPlayer2/src/main/log.txt
AGK/libprojects/android_assimp/log.txt
AGK/apps/interpreter_android_amazon/AGKPlayer2/src/main/jniLibs/arm64-v8a/libandroid_player.so
AGK/apps/interpreter_android_amazon/AGKPlayer2/src/main/jniLibs/armeabi-v7a/libandroid_player.so
AGK/apps/interpreter_android_google/AGKPlayer2/src/main/jniLibs/arm64-v8a/libandroid_player.so
AGK/apps/interpreter_android_google/AGKPlayer2/src/main/jniLibs/armeabi-v7a/libandroid_player.so
AGK/apps/interpreter_android_google_native/AGKPlayer2/src/main/jniLibs/arm64-v8a/libandroid_player.so
AGK/apps/interpreter_android_google_native/AGKPlayer2/src/main/jniLibs/armeabi-v7a/libandroid_player.so
AGK/apps/interpreter_android_google_noads/AGKPlayer2/src/main/jniLibs/arm64-v8a/libandroid_player.so
AGK/apps/interpreter_android_google_noads/AGKPlayer2/src/main/jniLibs/armeabi-v7a/libandroid_player.so
AGK/apps/interpreter_android_ouya/AGKPlayer2/src/main/jniLibs/arm64-v8a/libandroid_player.so
AGK/apps/interpreter_android_ouya/AGKPlayer2/src/main/jniLibs/armeabi-v7a/libandroid_player.so
AGK_Build/Shared/WindowsReceive/Studio/Android/lib/arm64-v8a/libandroid_player.so
AGK_Build/Shared/WindowsReceive/Studio/Android/lib/arm64-v8a/libarcore_sdk.so
AGK_Build/Shared/WindowsReceive/Studio/Android/lib/arm64-v8a/libpruneau.so
AGK_Build/Shared/WindowsReceive/Studio/Android/lib/armeabi-v7a/libandroid_player.so
AGK_Build/Shared/WindowsReceive/Studio/Android/lib/armeabi-v7a/libarcore_sdk.so
AGK_Build/Shared/WindowsReceive/Studio/Android/lib/armeabi-v7a/libpruneau.so
AGK/apps/interpreter_android_google/AGKPlayer2/src/main/log.txt
AGK/libprojects/android_assimp/log.txt
Original file line number Diff line number Diff line change
@@ -1,7 +0,0 @@
jni/../../../../../android_common_native/Core.cpp:566:22: warning: cast to 'void *' from smaller integer type 'int' [-Wint-to-void-pointer-cast]
agk::JoystickAxis( (void*)id, stick, axis, value );
^
jni/../../../../../android_common_native/Core.cpp:571:24: warning: cast to 'void *' from smaller integer type 'int' [-Wint-to-void-pointer-cast]
agk::JoystickButton( (void*)id, button, state );
^
2 warnings generated.
5 changes: 0 additions & 5 deletions AGK/apps/interpreter_android_google/copylibs-nopause.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ if not %ERRORLEVEL% equ 0 ( GOTO failed )
copy /y "AGKPlayer2\src\main\jniLibs\armeabi-v7a\libandroid_player.so" "..\interpreter_android_ouya\AGKPlayer2\src\main\jniLibs\armeabi-v7a\libandroid_player.so"
if not %ERRORLEVEL% equ 0 ( GOTO failed )

copy /y "AGKPlayer2\src\main\jniLibs\arm64-v8a\libandroid_player.so" "..\interpreter_android_google_dts\AGKPlayer2\src\main\jniLibs\arm64-v8a\libandroid_player.so"
if not %ERRORLEVEL% equ 0 ( GOTO failed )
copy /y "AGKPlayer2\src\main\jniLibs\armeabi-v7a\libandroid_player.so" "..\interpreter_android_google_dts\AGKPlayer2\src\main\jniLibs\armeabi-v7a\libandroid_player.so"
if not %ERRORLEVEL% equ 0 ( GOTO failed )

copy /y "AGKPlayer2\src\main\jniLibs\arm64-v8a\libandroid_player.so" "..\interpreter_android_google_noads\AGKPlayer2\src\main\jniLibs\arm64-v8a\libandroid_player.so"
if not %ERRORLEVEL% equ 0 ( GOTO failed )
copy /y "AGKPlayer2\src\main\jniLibs\armeabi-v7a\libandroid_player.so" "..\interpreter_android_google_noads\AGKPlayer2\src\main\jniLibs\armeabi-v7a\libandroid_player.so"
Expand Down
Loading

0 comments on commit fb2fefd

Please sign in to comment.