QuasarApp/Hanoi-Towers
4
0
Fork 0
mirror of https://github.com/QuasarApp/Hanoi-Towers.git synced 2025-04-26 09:44:32 +00:00
Code Issues Projects Releases Wiki Activity

fix build
Some checks failed
buildbot/IOSCMakeBuilder Build finished.
Details

Browse Source
This commit is contained in:
Andrei Yankovich 2022-02-23 13:45:52 +03:00
parent d83aeab252
commit 6143eb9d08
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -10,6 +10,7 @@ project(HanoiTowers)
set(BUILD_SHARED_LIBS ON) set(BUILD_SHARED_LIBS ON)
set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/HanoiTowers/client/android")
include(submodules/Heart/QuasarAppLib/CMake/QuasarApp.cmake) include(submodules/Heart/QuasarAppLib/CMake/QuasarApp.cmake)
include(submodules/Heart/QuasarAppLib/CMake/Version.cmake) include(submodules/Heart/QuasarAppLib/CMake/Version.cmake)
@ -104,7 +105,7 @@ else()
set (PATRONUM_TESTS OFF) set (PATRONUM_TESTS OFF)
endif() endif()
set(HEART_SSL OFF) option(HEART_SSL "This option enable or disabled ssl functions of nodes" OFF)
add_subdirectory(submodules/Heart) add_subdirectory(submodules/Heart)
add_subdirectory(HanoiTowers/Protockol) add_subdirectory(HanoiTowers/Protockol)
@ -119,7 +120,6 @@ if (HANOI_CLIENT)
add_subdirectory(submodules/Credits) add_subdirectory(submodules/Credits)
if (ANDROID) if (ANDROID)
set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/HanoiTowers/client/android")
if (HANOI_ADMOD) if (HANOI_ADMOD)
set(QTAT_APP_PERMISSIONS OFF) set(QTAT_APP_PERMISSIONS OFF)
set(QTAT_APK_EXPANSION_FILES OFF) set(QTAT_APK_EXPANSION_FILES OFF)

2
HanoiTowers/client/Background.qml
View File

@ -29,7 +29,7 @@ Item {
GradientStop { GradientStop {
position: 1; position: 1;
color: "#ff3782c8"; color: "#ff379fff";
} }

7
HanoiTowers/client/CMakeLists.txt
View File

@ -47,6 +47,7 @@ set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}") prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")
if (ANDROID) if (ANDROID)
set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
set(ENV{ANDROID_API_VERSION} 31) set(ENV{ANDROID_API_VERSION} 31)
set(ANDROID_API_VERSION $ENV{ANDROID_API_VERSION}) set(ANDROID_API_VERSION $ENV{ANDROID_API_VERSION})
@ -87,6 +88,12 @@ if (ANDROID)
file(GLOB java_files file(GLOB java_files
"android/src/com/quasarapp/androidtools/*.java" "android/src/com/quasarapp/androidtools/*.java"
"android/*.xml"
"android/*.in"
"android/*.gradle"
"android/gradlew"
"android/gradle.*"
) )
add_custom_target(${name}Android add_custom_target(${name}Android

4
HanoiTowers/client/android/build.gradle.in
View File

@ -5,8 +5,8 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath "com.android.tools.build:gradle:7.0.2"
} }
} }
repositories { repositories {

2
HanoiTowers/client/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

8
HanoiTowers/client/menu/CheatCard.qml
View File

@ -6,8 +6,8 @@ import QtQuick.Controls.Material 2.15
Dialog { Dialog {
width: parent.width * 0.6 width: parent.width * 0.8
height: parent.height * 0.8 height: parent.height * 0.9
x: parent.width / 2 - width / 2 x: parent.width / 2 - width / 2
y: parent.height / 2 - height / 2 y: parent.height / 2 - height / 2
@ -28,7 +28,7 @@ Dialog {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
Layout.alignment: Qt.AlignHCenter | Qt.AlignTop Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
Layout.preferredWidth: parent.width * 0.95 Layout.preferredWidth: parent.width * 0.60
Layout.preferredHeight: width * 0.4 Layout.preferredHeight: width * 0.4
source: "qrc:/img/res/CheatCard_Banner.jpg" source: "qrc:/img/res/CheatCard_Banner.jpg"
@ -56,5 +56,5 @@ Dialog {
} }
} }
standardButtons: Dialog.Ok // standardButtons: Dialog.Ok
} }