initCommit

This commit is contained in:
Andrei Yankovich 2021-05-06 17:15:22 +03:00
parent f64891f3f9
commit 742bb13ffc
7 changed files with 24 additions and 0 deletions

3
.gitmodules vendored
View File

@ -16,3 +16,6 @@
[submodule "HanoiTowers/client/Credits"]
path = submodules/Credits
url = https://github.com/QuasarApp/Credits
[submodule "submodules/QtAndroidTools"]
path = submodules/QtAndroidTools
url = https://github.com/QuasarApp/QtAndroidTools.git

View File

@ -97,7 +97,13 @@ if (HANOI_CLIENT)
add_subdirectory(submodules/SimpleQmlNotify)
add_subdirectory(submodules/ViewSolutions)
add_subdirectory(submodules/Credits)
if (ANDROID)
add_subdirectory(submodules/QtAndroidTools)
endif()
add_subdirectory(HanoiTowers/client)
endif()
if (HANOI_SERVER)

View File

@ -50,6 +50,8 @@ if (ANDROID)
QmlNotyfyService)
addDeployAPK(${CURRENT_PROJECT} "${CMAKE_CURRENT_LIST_DIR}/android" "digitalface" "${SIGN_PATH}/DigitalFaceMobily.keystore" "${SIGN_STORE_PASSWORD}" "${TARGET_DIR}" "${HANOI_EXTRA_LIBS}")
target_link_libraries(${CURRENT_PROJECT} PRIVATE QtAndroidTools)
else()
# Desctop deploying
addDeployFromCustomFile("Client" "${CMAKE_SOURCE_DIR}/Deploy/Client.json")

View File

@ -10,6 +10,12 @@
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true" android:icon="@drawable/icon">
<!-- Sample AdMob app ID: ca-app-pub-5799112356811682~1226170116 -->
<meta-data
android:name="com.google.android.gms.ads.APPLICATION_ID"
android:value="ca-app-pub-5799112356811682~1226170116"/>
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="landscape" android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

View File

@ -18,6 +18,7 @@ apply plugin: 'com.android.application'
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
implementation 'com.google.android.gms:play-services-ads:20.1.0'
}
android {
@ -71,6 +72,7 @@ android {
defaultConfig {
resConfig "en"
multiDexEnabled true
minSdkVersion = 22
targetSdkVersion = 30
}

View File

@ -9,3 +9,7 @@ org.gradle.jvmargs=-Xmx2048m
# build with the same inputs. However, over time, the cache size will
# grow. Uncomment the following line to enable it.
#org.gradle.caching=true
android.useAndroidX=true
android.enableJetifier=true

@ -0,0 +1 @@
Subproject commit fb3474dd183727790294e600c07531c20af22eb6