mirror of
https://github.com/QuasarApp/Hanoi-Towers.git
synced 2025-04-26 17:54:31 +00:00
try fix build
This commit is contained in:
parent
7af8200d6c
commit
17544900b8
@ -118,28 +118,29 @@ if (HANOI_CLIENT)
|
||||
|
||||
if (ANDROID)
|
||||
set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/HanoiTowers/client/android")
|
||||
set(QTAT_APP_PERMISSIONS OFF)
|
||||
set(QTAT_APK_EXPANSION_FILES OFF)
|
||||
set(QTAT_APK_INFO OFF)
|
||||
set(QTAT_SCREEN OFF)
|
||||
set(QTAT_SYSTEM OFF)
|
||||
set(QTAT_BATTERY_STATE OFF)
|
||||
set(QTAT_SIGNAL_STRENGTH OFF)
|
||||
set(QTAT_IMAGES OFF)
|
||||
set(QTAT_NOTIFICATION OFF)
|
||||
set(QTAT_ADMOB_BANNER OFF)
|
||||
set(QTAT_ADMOB_INTERSTITIAL ON)
|
||||
set(QTAT_ADMOB_REWARDED_VIDEO OFF)
|
||||
set(QTAT_PLAY_STORE OFF)
|
||||
set(QTAT_GOOGLE_ACCOUNT OFF)
|
||||
set(QTAT_GOOGLE_DRIVE OFF)
|
||||
set(QTAT_SHARING OFF)
|
||||
set(QTAT_USER_MESSAGING_PLATFORM OFF)
|
||||
set(QTAT_AUDIO OFF)
|
||||
|
||||
add_subdirectory(submodules/QtAndroidTools/QtAndroidTools)
|
||||
include_directories(submodules/QtAndroidTools/QtAndroidTools)
|
||||
if (HANOI_ADMOD)
|
||||
set(QTAT_APP_PERMISSIONS OFF)
|
||||
set(QTAT_APK_EXPANSION_FILES OFF)
|
||||
set(QTAT_APK_INFO OFF)
|
||||
set(QTAT_SCREEN OFF)
|
||||
set(QTAT_SYSTEM OFF)
|
||||
set(QTAT_BATTERY_STATE OFF)
|
||||
set(QTAT_SIGNAL_STRENGTH OFF)
|
||||
set(QTAT_IMAGES OFF)
|
||||
set(QTAT_NOTIFICATION OFF)
|
||||
set(QTAT_ADMOB_BANNER OFF)
|
||||
set(QTAT_ADMOB_INTERSTITIAL ON)
|
||||
set(QTAT_ADMOB_REWARDED_VIDEO OFF)
|
||||
set(QTAT_PLAY_STORE OFF)
|
||||
set(QTAT_GOOGLE_ACCOUNT OFF)
|
||||
set(QTAT_GOOGLE_DRIVE OFF)
|
||||
set(QTAT_SHARING OFF)
|
||||
set(QTAT_USER_MESSAGING_PLATFORM OFF)
|
||||
set(QTAT_AUDIO OFF)
|
||||
|
||||
add_subdirectory(submodules/QtAndroidTools/QtAndroidTools)
|
||||
include_directories(submodules/QtAndroidTools/QtAndroidTools)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
add_subdirectory(HanoiTowers/client)
|
||||
|
@ -58,7 +58,13 @@ if (ANDROID)
|
||||
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED)
|
||||
|
||||
addDeployAPK(${CURRENT_PROJECT} "${CMAKE_CURRENT_LIST_DIR}/android" "digitalface" "${SIGPATH}/DigitalFaceMobily.keystore" "${SIGPASS_HANOI}" "${TARGET_DIR}" "${HANOI_EXTRA_LIBS}")
|
||||
target_link_libraries(${CURRENT_PROJECT} PRIVATE QtAndroidTools Qt${QT_VERSION_MAJOR}::AndroidExtras)
|
||||
|
||||
target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras)
|
||||
|
||||
if (HANOI_ADMOD)
|
||||
target_link_libraries(${CURRENT_PROJECT} PRIVATE QtAndroidTools)
|
||||
|
||||
endif()
|
||||
|
||||
file(GLOB java_files
|
||||
"android/src/com/quasarapp/androidtools/*.java"
|
||||
|
@ -18,7 +18,7 @@ apply plugin: 'com.android.application'
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
|
||||
implementation 'com.google.android.gms:play-services-ads:19.+'
|
||||
// implementation 'com.google.android.gms:play-services-ads:19.+'
|
||||
}
|
||||
|
||||
android {
|
||||
|
@ -18,8 +18,10 @@
|
||||
#include <qmlnotifyservice.h>
|
||||
#include <credits.h>
|
||||
#ifdef Q_OS_ANDROID
|
||||
#ifdef HANOI_ADMOD
|
||||
#include <QtAndroidTools.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
@ -55,8 +57,9 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
#ifdef Q_OS_ANDROID
|
||||
#ifdef HANOI_ADMOD
|
||||
QtAndroidTools::initializeQmlTools();
|
||||
|
||||
#endif
|
||||
ActivityHandler *activityHandler = new ActivityHandler(&app);
|
||||
engine.rootContext()->setContextProperty(QLatin1String("activityHandler"), activityHandler);
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user