Merge pull request #4574 from BreadFish64/android5
android: minor changes
@ -15,9 +15,10 @@ if (ENABLE_QT)
|
||||
add_subdirectory(citra_qt)
|
||||
endif()
|
||||
if (ANDROID)
|
||||
add_subdirectory(android/app)
|
||||
add_subdirectory(android/app/src/main/cpp)
|
||||
else()
|
||||
add_subdirectory(dedicated_room)
|
||||
endif()
|
||||
if (ENABLE_WEB_SERVICE)
|
||||
add_subdirectory(web_service)
|
||||
endif()
|
||||
add_subdirectory(dedicated_room)
|
||||
|
@ -70,6 +70,8 @@ android {
|
||||
"-DANDROID_STL=c++_shared"
|
||||
|
||||
abiFilters "arm64-v8a"
|
||||
|
||||
targets "citra-android"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -15,12 +15,12 @@
|
||||
|
||||
<application
|
||||
android:name="org.citra_emu.citra.CitraApplication"
|
||||
android:label="Citra Emulator"
|
||||
android:icon="@drawable/ic_citra"
|
||||
android:label="Citra"
|
||||
android:icon="@mipmap/ic_citra"
|
||||
android:allowBackup="true"
|
||||
android:supportsRtl="true"
|
||||
android:isGame="true"
|
||||
android:banner="@drawable/ic_citra">
|
||||
android:banner="@mipmap/ic_citra">
|
||||
|
||||
<activity
|
||||
android:name=".ui.main.MainActivity"
|
||||
|
@ -1,7 +1,7 @@
|
||||
cmake_minimum_required(VERSION 3.8)
|
||||
|
||||
add_library(citra-android STATIC
|
||||
src/main/cpp/dummy.cpp
|
||||
add_library(citra-android SHARED
|
||||
dummy.cpp
|
||||
)
|
||||
|
||||
# find Android's log library
|
BIN
src/android/app/src/main/ic_citra-web.png
Normal file
After Width: | Height: | Size: 43 KiB |
Before Width: | Height: | Size: 132 B |
Before Width: | Height: | Size: 8.9 KiB |
Before Width: | Height: | Size: 139 B |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 186 B |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 254 B |
Before Width: | Height: | Size: 332 B |
5
src/android/app/src/main/res/drawable/ic_add.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<vector android:height="24dp" android:tint="#FFFFFF"
|
||||
android:viewportHeight="24.0" android:viewportWidth="24.0"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
|
||||
</vector>
|
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
BIN
src/android/app/src/main/res/mipmap-hdpi/ic_citra.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
BIN
src/android/app/src/main/res/mipmap-hdpi/ic_citra_round.png
Normal file
After Width: | Height: | Size: 5.1 KiB |
After Width: | Height: | Size: 6.1 KiB |
BIN
src/android/app/src/main/res/mipmap-mdpi/ic_citra.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
src/android/app/src/main/res/mipmap-mdpi/ic_citra_round.png
Normal file
After Width: | Height: | Size: 2.9 KiB |
After Width: | Height: | Size: 3.6 KiB |
BIN
src/android/app/src/main/res/mipmap-xhdpi/ic_citra.png
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
src/android/app/src/main/res/mipmap-xhdpi/ic_citra_round.png
Normal file
After Width: | Height: | Size: 7.6 KiB |
After Width: | Height: | Size: 9.0 KiB |
BIN
src/android/app/src/main/res/mipmap-xxhdpi/ic_citra.png
Normal file
After Width: | Height: | Size: 7.2 KiB |
BIN
src/android/app/src/main/res/mipmap-xxhdpi/ic_citra_round.png
Normal file
After Width: | Height: | Size: 13 KiB |
After Width: | Height: | Size: 15 KiB |
BIN
src/android/app/src/main/res/mipmap-xxxhdpi/ic_citra.png
Normal file
After Width: | Height: | Size: 11 KiB |
BIN
src/android/app/src/main/res/mipmap-xxxhdpi/ic_citra_round.png
Normal file
After Width: | Height: | Size: 18 KiB |
After Width: | Height: | Size: 23 KiB |
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#FFFFFF</color>
|
||||
</resources>
|