salmon-engine-projects/salmon-wallpaper
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Android version update

Browse Source
This commit is contained in:
Vladislav Khorev 2018-10-31 14:48:08 +05:00
parent ac296727de
commit 77616bef24
17 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
proj.android-studio/.gitignore vendored Executable file
View File

@ -0,0 +1,10 @@
*.iml
.gradle
/local.properties
/.idea
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/build
/captures
.externalNativeBuild

51
proj.android-studio/app/CMakeLists.txt
View File

@ -1,50 +1,35 @@
# Sets the minimum version of CMake required to build the native
# library. You should either keep the default value or only pass a
# value of 3.4.0 or lower.
cmake_minimum_required(VERSION 3.4.1) cmake_minimum_required(VERSION 3.4.1)
# Creates and names a library, sets it as either STATIC set(BOOST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../boost_1_67_0)
# or SHARED, and provides the relative paths to its source code.
# You can define multiple libraries, and CMake builds it for you.
# Gradle automatically packages shared libraries with your APK.
add_definitions(-DTARGET_ANDROID)
set(BOOST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../boost_1_63_0)
set(BOOST_GIL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/boost-gil-extension) set(BOOST_GIL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/boost-gil-extension)
set(ZIP_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/julienr-libzip-android/jni) set(ZIP_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/julienr-libzip-android/jni)
set(LIBPNG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/libpng_1.4.1_android) set(LIBPNG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/libpng_1.4.1_android)
set(LIBJPEG_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/jpeg-9)
set(EIGEN_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../eigen)
set(SOL2_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../sol2)
set(LUA_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/lua-5.3.4/src)
set(LIBJPEG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/jpeg-9") include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../tes-engine)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../engine)
include_directories(${BOOST_PATH}) include_directories(${BOOST_PATH})
include_directories(${EIGEN_PATH})
include_directories(${SOL2_PATH})
include_directories(${LUA_PATH})
include_directories(${LIBPNG_PATH}) include_directories(${LIBPNG_PATH})
include_directories(${LIBJPEG_PATH}) include_directories(${LIBJPEG_PATH})
include_directories(${ZIP_PATH}) include_directories(${ZIP_PATH})
include_directories(${BOOST_GIL_PATH}) include_directories(${BOOST_GIL_PATH})
add_library( engine add_definitions(-DTARGET_ANDROID)
SHARED
IMPORTED )
set_target_properties( # Specifies the target library. add_library(engine SHARED IMPORTED
engine
# Specifies the parameter you want to define. )
PROPERTIES IMPORTED_LOCATION
# Provides the path to the library you want to import. set_target_properties(engine PROPERTIES IMPORTED_LOCATION
${CMAKE_CURRENT_SOURCE_DIR}/build/intermediates/exploded-aar/proj.android-studio/SalmonEngineAndroid/unspecified/jni/${ANDROID_ABI}/libengine.so )
${CMAKE_CURRENT_SOURCE_DIR}/../../../tes-engine/SalmonEngineAndroid/app/build/intermediates/cmake/debug/obj/${ANDROID_ABI}/libengine.so
)
@ -57,8 +42,8 @@ add_library( # Sets the name of the library.
# Provides a relative path to your source file(s). # Provides a relative path to your source file(s).
# Associated headers in the same location as their source # Associated headers in the same location as their source
# file are automatically included. # file are automatically included.
${CMAKE_CURRENT_SOURCE_DIR}/../../game/android_api.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../jni/android_api.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../game/main_code.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../jni/main_code.cpp
) )

19
proj.android-studio/app/build.gradle
View File

@ -1,14 +1,14 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 24 compileSdkVersion 28
buildToolsVersion "24.0.1" buildToolsVersion "28.0.0"
defaultConfig { defaultConfig {
applicationId "fishrungames.mountainwallpaper" applicationId "fishrungames.mountainwallpaper"
minSdkVersion 15 minSdkVersion 19
targetSdkVersion 24 targetSdkVersion 28
versionCode 1 versionCode 2
versionName "1.0" versionName "1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild { externalNativeBuild {
cmake { cmake {
@ -36,11 +36,8 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations' compile 'com.android.support:appcompat-v7:28+'
})
compile 'com.android.support:appcompat-v7:24.2.1'
testCompile 'junit:junit:4.12'
compile project(':SalmonEngineAndroid') compile project(':SalmonEngineAndroid')
} }

1
proj.android-studio/app/src/main/AndroidManifest.xml
View File

@ -20,7 +20,6 @@
android:resource="@xml/wallpaper" /> android:resource="@xml/wallpaper" />
</service> </service>
</application> </application>
<uses-sdk android:minSdkVersion="8" />
<uses-feature android:glEsVersion="0x00020000"/> <uses-feature android:glEsVersion="0x00020000"/>
</manifest> </manifest>

4
proj.android-studio/app/src/main/res/layout/prefliste.xml
View File

@ -4,7 +4,7 @@
android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent"> android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent">
<RelativeLayout android:id="@+id/LinearLayout01" android:layout_height="wrap_content" android:layout_width="fill_parent"><ImageView android:id="@+id/ImageView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/icon" android:layout_alignParentLeft="true" android:layout_marginLeft="3dp"></ImageView> <RelativeLayout android:id="@+id/LinearLayout01" android:layout_height="wrap_content" android:layout_width="fill_parent"><ImageView android:id="@+id/ImageView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/icon" android:layout_alignParentLeft="true" android:layout_marginLeft="3dp"></ImageView>
</RelativeLayout> </RelativeLayout>
<ListView android:layout_width="fill_parent" android:id="@+id/android:list" android:layout_height="wrap_content"></ListView> <ListView android:layout_width="fill_parent" android:id="@+id/android_list" android:layout_height="wrap_content"></ListView>
<TextView android:layout_width="fill_parent" android:id="@+id/android:text_feedback" android:padding="20px" android:text="@string/feedback" android:layout_height="wrap_content"></TextView> <TextView android:layout_width="fill_parent" android:id="@+id/android_text_feedback" android:padding="20px" android:text="@string/feedback" android:layout_height="wrap_content"></TextView>
</LinearLayout> </LinearLayout>

1
proj.android-studio/app/src/main/res/values-cs/strings.xml
View File

@ -18,5 +18,6 @@
<item>Noc</item> <item>Noc</item>
</string-array> </string-array>
<string name="text_feedback">Feedback</string>
</resources> </resources>

2
proj.android-studio/app/src/main/res/values-de/strings.xml
View File

@ -17,6 +17,6 @@
<item>Night</item> <item>Night</item>
</string-array> </string-array>
<string name="text_feedback">Feedback</string>
</resources> </resources>

2
proj.android-studio/app/src/main/res/values-es/strings.xml
View File

@ -18,6 +18,6 @@
<item>Noche</item> <item>Noche</item>
</string-array> </string-array>
<string name="text_feedback">Feedback</string>
</resources> </resources>

2
proj.android-studio/app/src/main/res/values-fr/strings.xml
View File

@ -17,6 +17,6 @@
<item>Nuit</item> <item>Nuit</item>
</string-array> </string-array>
<string name="text_feedback">Feedback</string>
</resources> </resources>

1
proj.android-studio/app/src/main/res/values-it/strings.xml
View File

@ -26,5 +26,6 @@
<item>2</item> <item>2</item>
</string-array> </string-array>
<string name="text_feedback">Feedback</string>
</resources> </resources>

2
proj.android-studio/app/src/main/res/values-nl/strings.xml
View File

@ -17,6 +17,6 @@
<item>Nacht</item> <item>Nacht</item>
</string-array> </string-array>
<string name="text_feedback">Feedback</string>
</resources> </resources>

2
proj.android-studio/app/src/main/res/values-pt/strings.xml
View File

@ -18,6 +18,6 @@
<item>Noite</item> <item>Noite</item>
</string-array> </string-array>
<string name="text_feedback">Feedback</string>
</resources> </resources>

2
proj.android-studio/app/src/main/res/values-ru/strings.xml
View File

@ -18,6 +18,6 @@
<item>Ночь</item> <item>Ночь</item>
</string-array> </string-array>
<string name="text_feedback">Feedback</string>
</resources> </resources>

1
proj.android-studio/app/src/main/res/values/strings.xml
View File

@ -39,5 +39,6 @@
<item>2</item> <item>2</item>
</string-array> </string-array>
<string name="text_feedback">Feedback</string>
</resources> </resources>

8
proj.android-studio/build.gradle
View File

@ -1,20 +1,26 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.2.70'
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.android.tools.build:gradle:3.2.0-rc03'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
} }
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
} }
} }

4
proj.android-studio/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Mon Dec 28 10:00:20 PST 2015 #Sat Jul 14 10:38:38 YEKT 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

2
proj.android-studio/settings.gradle
View File

@ -1,5 +1,5 @@
include ':SalmonEngineAndroid' include ':SalmonEngineAndroid'
project(':SalmonEngineAndroid').projectDir =new File(settingsDir, '../../engine/SalmonEngineAndroid/app') project(':SalmonEngineAndroid').projectDir =new File(settingsDir, '../../tes-engine/SalmonEngineAndroid/app')
include ':app' include ':app'