workaround to fix broken boost variant, changed minSdkVersion

2018-08-06 21:51:51 +05:00 · 2018-08-06 21:51:51 +05:00 · 69cb2f7cd3
commit 69cb2f7cd3
parent b4b42561eb
3 changed files with 5 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -75,3 +75,4 @@ iOSInjectionProject/
 /windows/DoubleHitBalls-win/DoubleHitBalls-win/resources
 *.db
 *.opendb
+/proj.android-studio/app/release/
--- a/game/main_code.cpp
+++ b/game/main_code.cpp
@ -627,7 +627,7 @@ void TMyApplication::SetupGalaxyUi(size_t levelStar)

 				currentLevelButton->setVisibility(true);

-				currentLevelButton->setBackground(levelName + "_prerender");
+                currentLevelButton->setBackground(ResourceManager->newGuiManager.layoutBackgroundFromConfigValue(levelName + "_prerender"));
 				
 				currentLevelButton->onMouseUpSignal.connect(
 					[this, modal_background, levelStar, levelIndex](Vector2f v, int i) {
--- a/proj.android-studio/app/build.gradle
+++ b/proj.android-studio/app/build.gradle
@ -5,7 +5,7 @@ android {
    buildToolsVersion "28.0.0"
    defaultConfig {
        applicationId "fishrungames.DoubleHitBalls"
-        minSdkVersion 15
+        minSdkVersion 24
        targetSdkVersion 28
        versionCode 1
        versionName "1.0"